Updated Norwegian bokmål translation.

2007-06-06 Kjartan Maraas <kmaraas@gnome.org> * nb.po: Updated Norwegian bokmål translation. svn path=/trunk/; revision=33660
author: Kjartan Maraas <kmaraas@gnome.org> 2007-06-06 17:14:45 +0800
committer: Kjartan Maraas <kmaraas@src.gnome.org> 2007-06-06 17:14:45 +0800
commit: c43e87ecbaca9612672971e13b2b6836fad1db5f (patch)
tree: 383185e643f7d5f03b4ecc21948c88ef2bd3dc43 /po/nb.po
parent: b0dd9fa1e95776beb321ec4582ed8c3da81bddde (diff)
download: gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar
gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.gz
gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.bz2
gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.lz
gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.xz
gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.zst
gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.zip
1 files changed, 4094 insertions, 3945 deletions
diff --git a/po/nb.po b/po/nb.po
index 76ff9b7778..4b1825ee8f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-23 18:57+0200\n"
-"PO-Revision-Date: 2007-04-23 19:02+0200\n"
+"POT-Creation-Date: 2007-06-06 10:13+0200\n"
+"PO-Revision-Date: 2007-06-06 11:11+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -24,30 +24,13 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
-#: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Åpne"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "Kontaktliste: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Kontakt: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "evolution minikort"
-
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:223
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Ny kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
@@ -58,25 +41,22 @@ msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "aktiv adressebokmappe %s har %d kontakt"
 msgstr[1] "aktiv adressebokmappe %s har %d kontakter"
 
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "New Appointment"
-msgstr "Ny avtale"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "New All Day Event"
-msgstr "Ny avtale som varer hele dagen"
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Åpne"
 
-#: ../a11y/calendar/ea-cal-view.c:304
-msgid "New Meeting"
-msgstr "Nytt møte"
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Kontaktliste: "
 
-#: ../a11y/calendar/ea-cal-view.c:305
-msgid "Go to Today"
-msgstr "Gå til i dag"
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Kontakt: "
 
-#: ../a11y/calendar/ea-cal-view.c:306
-msgid "Go to Date"
-msgstr "Gå til dato"
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "evolution minikort"
 
 #: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
@@ -107,6 +87,31 @@ msgstr "vis kalenderhendelse"
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "Ny avtale"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "Ny avtale som varer hele dagen"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "Nytt møte"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "Gå til i dag"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+msgid "Go to Date"
+msgstr "Gå til dato"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "en tabell som viser og velger aktivt tidsområde"
+
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
 #: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
@@ -146,13 +151,8 @@ msgstr "kalendervisning for en arbeidsuke"
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
-#: ../a11y/calendar/ea-week-view-main-item.c:301
-msgid "a table to view and select the current time range"
-msgstr "en tabell som viser og velger aktivt tidsområde"
-
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:713
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -163,8 +163,9 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:710 ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:716
 #: ../calendar/gui/e-day-view-top-item.c:1315
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -173,9 +174,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:723
+#: ../calendar/gui/calendar-component.c:725
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -183,10 +184,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:737
 #: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:752
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -196,8 +197,9 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:736 ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:742
 #: ../calendar/gui/e-day-view-top-item.c:1319
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -243,10 +245,6 @@ msgstr "kalendervisning for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
-msgid "Table Cell"
-msgstr "Celle i tabell"
-
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
 msgid "popup"
 msgstr "oppsprett"
@@ -273,22 +271,26 @@ msgstr "vend"
 msgid "toggle the cell"
 msgstr "vend cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "utvid"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "utvider raden i ETree som inneholder denne cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "slå sammen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår sammen raden i ETree som inneholder denne cellen"
 
+#: ../a11y/e-table/gal-a11y-e-cell.c:107
+msgid "Table Cell"
+msgstr "Celle i tabell"
+
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
 #: ../widgets/table/e-table-click-to-add.c:574
@@ -403,7 +405,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1854
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1853
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -566,29 +568,70 @@ 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:99
-msgid "Accessing LDAP Server anonymously"
-msgstr "Aksesserer LDAP-tjener anonymt"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autofullføring"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
-msgid "Failed to authenticate.\n"
-msgstr "Kunne ikke autentisere.\n"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "K_ontakter"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Oppgi passord for %s (bruker %s)"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Sertifikater"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Konfigurer automatisk fullføring her"
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:277 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:581
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "Evolution adressebok"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr "Evolution adressebok adressevisning"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr "Evolution adressebok kortvisning"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr "Evolution adressebok-komponent"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Håndter dine S/MIME-sertifikater her"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:488
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
@@ -599,54 +642,54 @@ msgstr "På denne datamaskinen"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:496
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:246
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:491
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
+#: ../calendar/gui/tasks-component.c:204 ../filter/filter-label.c:122
+#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personlig"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:506
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:244
 #: ../addressbook/gui/component/addressbook-config.c:1208
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:404
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
 
@@ -656,7 +699,6 @@ msgstr "Basis"
 
 #: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:172
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Type:"
 msgstr "_Type:"
 
@@ -666,18 +708,18 @@ msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
 
 #: ../addressbook/gui/component/addressbook-config.c:984
 #: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:365
 #: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:2087
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:564
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Adressebok"
@@ -697,7 +739,7 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:854
+#: ../mail/em-folder-browser.c:855
 msgid "Searching"
 msgstr "Søker"
 
@@ -711,25 +753,25 @@ msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "Migrerer..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:634
 msgid "LDAP Servers"
 msgstr "LDAP-tjenere"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:749
 msgid "Autocompletion Settings"
 msgstr "Innstillinger for autofullføring"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1124
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -741,7 +783,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1138
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -751,7 +793,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1147
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -761,7 +803,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -797,14 +839,14 @@ msgstr "_Ny adressebok"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
-#: ../calendar/gui/calendar-component.c:584
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../calendar/gui/calendar-component.c:590
 #: ../calendar/gui/e-calendar-table.c:1303
 #: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:919
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2103 ../mail/em-folder-view.c:1148
+#: ../calendar/gui/memos-component.c:458 ../calendar/gui/tasks-component.c:449
+#: ../mail/em-folder-tree.c:2121 ../mail/em-folder-view.c:1151
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Slett"
@@ -814,36 +856,43 @@ msgid "Save As Vcard..."
 msgstr "Lagre som VCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
+#: ../calendar/gui/calendar-component.c:591
+#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
 msgid "_Properties..."
 msgstr "E_genskaper ..."
 
-#. Create the contacts group
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr "Aksesserer LDAP-tjener anonymt"
+
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:507
+msgid "Failed to authenticate.\n"
+msgstr "Kunne ikke autentisere.\n"
+
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:487
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Oppgi passord for %s (bruker %s)"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Lengde for autofullføring"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
@@ -851,82 +900,34 @@ msgstr ""
 "Plassering til vertikalt felt mellom kort- og listevisningen og "
 "forhåndsvisningsfeltet, i piksler."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "Vis forhåndsvisningsområdet"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 "Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 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/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 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/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Posisjon til vertikalt felt"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Om forhåndsvisningsområdet skal vises."
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "K_ontakter"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Sertifikater"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Konfigurer automatisk fullføring her"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution adressebok"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution adressebok adressevisning"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution adressebok kortvisning"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Evolution adressebok-komponent"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Håndter dine S/MIME-sertifikater her"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
@@ -948,7 +949,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
@@ -1195,8 +1195,7 @@ msgstr "Metode for på_logging:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:225
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:169
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Navn:"
@@ -1210,7 +1209,7 @@ msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:176
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "Tj_ener:"
@@ -1230,11 +1229,10 @@ msgstr "kort"
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../mail/em-account-editor.c:2054
 #: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/calendar-weather/calendar-weather.c:561
 msgid "minutes"
 msgstr "minutter"
 
@@ -1275,13 +1273,13 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:194
@@ -1289,9 +1287,9 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1331,12 +1329,12 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:158
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1357,7 +1355,7 @@ msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:866
+#: ../calendar/gui/dialogs/event-page.c:871
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1716
 msgid "_Calendar:"
@@ -1451,40 +1449,6 @@ msgstr "_Hvor:"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette kontaktliste (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette disse kontaktlistene?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette kontakt (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
-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/e-contact-editor-address.c:97
 #: ../addressbook/gui/widgets/eab-contact-display.c:577
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -1492,20 +1456,20 @@ msgid "Address"
 msgstr "Adresse"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
+#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:181
 #: ../widgets/table/e-cell-text.c:1830 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3623
-#: ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2477,89 +2441,125 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-view-new-dialog.c:73
+msgid "Name"
+msgstr "Navn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "AOL Instant Messenger"
+msgstr "AOL øyeblikksmeldinger"
+
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+msgid "Gadu-Gadu Messenger"
+msgstr "Gadu-Gadu Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+msgid "Service"
+msgstr "Tjeneste"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../plugins/save-calendar/csv-format.c:400
+msgid "Location"
+msgstr "Lokasjon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+msgid "Username"
+msgstr "Brukernavn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hjemme"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Andre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "Målbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "Endret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2796
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2567,62 +2567,26 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3129
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-view-new-dialog.c:73
-msgid "Name"
-msgstr "Navn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "AOL Instant Messenger"
-msgstr "AOL øyeblikksmeldinger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-msgid "Service"
-msgstr "Tjeneste"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
-msgid "Location"
-msgstr "Lokasjon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
-msgid "Username"
-msgstr "Brukernavn"
-
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
@@ -2643,6 +2607,40 @@ msgstr "E-_post"
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette kontaktliste (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette disse kontaktlistene?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette kontakt (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
+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/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2676,7 +2674,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -2795,10 +2793,10 @@ msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Bok"
 
@@ -2859,41 +2857,481 @@ msgstr "Flett kontakt"
 msgid "Merge"
 msgstr "Flett"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:259
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:535
 #: ../addressbook/gui/widgets/eab-contact-display.c:537
 #: ../addressbook/gui/widgets/eab-contact-display.c:780
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+msgid "No contacts"
+msgstr "Ingen kontakter"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakter"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
+msgid "Query"
+msgstr "Spør"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+msgid "Error getting book view"
+msgstr "Feil under henting av bokvisning"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../widgets/table/e-table-click-to-add.c:502
+#: ../widgets/table/e-table-selection-model.c:311
+#: ../widgets/table/e-table.c:3338
+#: ../widgets/table/e-tree-selection-model.c:825
+#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
+msgid "Model"
+msgstr "Modell"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+msgid "Error modifying card"
+msgstr "Feil ved endring av kort"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+msgid "Source"
+msgstr "Kilde"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:6
+msgid "Type"
+msgstr "Type"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:835
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2072
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Lagre som VCard..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/e-calendar-table.c:1281
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "_Åpne"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+msgid "_New Contact..."
+msgstr "_Ny kontakt..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+msgid "New Contact _List..."
+msgstr "Ny kontakt_liste..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+msgid "_Save as VCard..."
+msgstr "Lagre _som VCard..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+msgid "_Forward Contact"
+msgstr "_Videresend kontakt"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+msgid "_Forward Contacts"
+msgstr "_Videresend kontakter"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "Send _Message to Contact"
+msgstr "Send _melding til kontakt"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "Send _Message to List"
+msgstr "Send _melding til liste"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+msgid "Send _Message to Contacts"
+msgstr "Send _melding til kontakter"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+msgid "_Print"
+msgstr "_Skriv ut"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+msgid "Cop_y to Address Book..."
+msgstr "_Kopier til adressebok..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+msgid "Mo_ve to Address Book..."
+msgstr "_Flytt til adressebok..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "Klipp u_t"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../calendar/gui/calendar-component.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:463
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/memos-component.c:457 ../calendar/gui/tasks-component.c:448
+#: ../composer/e-msg-composer.c:3177 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1136 ../mail/message-list.c:1962
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Kopier"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+msgid "P_aste"
+msgstr "_Lim inn"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1659
+#: ../calendar/gui/cal-search-bar.c:646 ../calendar/gui/cal-search-bar.c:689
+#: ../calendar/gui/cal-search-bar.c:708
+msgid "Any Category"
+msgstr "Enhver kategori"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1853
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "Other error"
+msgstr "Annen feil"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
+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/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
+msgid "Categories"
+msgstr "Kategorier"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+msgid "Company"
+msgstr "Firma"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firmatelefon"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Family Name"
+msgstr "Etternavn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr "Lagre som"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Given Name"
+msgstr "Gitt navn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "Faks hjemme"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone"
+msgstr "Hjemmetelefon"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone 2"
+msgstr "Hjemmetelefon 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "ISDN-telefon"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Journal"
+msgstr "Journal"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
+msgid "Manager"
+msgstr "Leder"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "Note"
+msgstr "Kommentar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+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/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+msgid "Role"
+msgstr "Rolle"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
+msgid "Spouse"
+msgstr "Ektefelle"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Teleks"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Tittel"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "Enhet"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Nettside"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
+msgid "Width"
+msgstr "Bredde"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
+msgid "Height"
+msgstr "Høyde"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:165
+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:128
+msgid "Column Width"
+msgstr "Kolonnebredde"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Søk etter kontakten\n"
+"\n"
+"eller dobbelklikk her for å opprette en ny kontakt."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+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:182
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Søk etter kontakten."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
+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:501
+msgid "Adapter"
+msgstr "Adapter"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+msgid "Work Email"
+msgstr "E-post på arbeid"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+msgid "Home Email"
+msgstr "E-post hjemme"
+
+#: ../addressbook/gui/widgets/e-minicard.c:104
+msgid "Other Email"
+msgstr "Annen e-post"
+
+#: ../addressbook/gui/widgets/e-minicard.c:173
+msgid "Selected"
+msgstr "Valgt"
+
+#: ../addressbook/gui/widgets/e-minicard.c:180
+msgid "Has Cursor"
+msgstr "Har markør"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:625
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2548
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:626
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til..."
 
@@ -2917,16 +3355,6 @@ msgstr "kart"
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisasjon"
-
 #: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Department"
 msgstr "Avdeling"
@@ -2939,31 +3367,21 @@ msgstr "Yrke"
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Leder"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistent"
-
 #: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Video Chat"
 msgstr "Videosamtale"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 #: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/gnome-cal.c:2306
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../calendar/gui/gnome-cal.c:2354
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:396
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:540
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalender"
@@ -2992,11 +3410,6 @@ msgstr "Hjemmeside"
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: ../addressbook/gui/widgets/eab-contact-display.c:593
 msgid "Birthday"
 msgstr "Fødselsdag"
@@ -3005,16 +3418,6 @@ msgstr "Fødselsdag"
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Ektefelle"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Kommentar"
-
 #: ../addressbook/gui/widgets/eab-contact-display.c:776
 msgid "Job Title"
 msgstr "Jobbtittel"
@@ -3080,9 +3483,9 @@ msgstr "Protokollen er ikke støttet"
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-calendar-table.c:464
 #: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664 ../calendar/gui/print.c:2351
+#: ../calendar/gui/e-cal-model-tasks.c:664
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -3118,12 +3521,6 @@ msgstr "Ingen slik kilde"
 msgid "Not available in offline mode"
 msgstr "Ikke tilgjengelig i frakoblet modus"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1854
-msgid "Other error"
-msgstr "Annen feil"
-
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Invalid server version"
@@ -3347,420 +3744,15 @@ msgstr "Vis kompakt VCard"
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
-msgid "No contacts"
-msgstr "Ingen kontakter"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakter"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-msgid "Query"
-msgstr "Spør"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
-msgid "Error getting book view"
-msgstr "Feil under henting av bokvisning"
-
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3487 ../widgets/text/e-text.c:3488
-msgid "Model"
-msgstr "Modell"
-
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
-msgid "Error modifying card"
-msgstr "Feil ved endring av kort"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-msgid "Source"
-msgstr "Kilde"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
-msgid "Type"
-msgstr "Type"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:836
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2073
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Lagre som VCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "_Åpne"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-msgid "_New Contact..."
-msgstr "_Ny kontakt..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
-msgid "New Contact _List..."
-msgstr "Ny kontakt_liste..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-msgid "_Save as VCard..."
-msgstr "Lagre _som VCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
-msgid "_Forward Contact"
-msgstr "_Videresend kontakt"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
-msgid "_Forward Contacts"
-msgstr "_Videresend kontakter"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
-msgid "Send _Message to Contact"
-msgstr "Send _melding til kontakt"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
-msgid "Send _Message to List"
-msgstr "Send _melding til liste"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-msgid "Send _Message to Contacts"
-msgstr "Send _melding til kontakter"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
-msgid "_Print"
-msgstr "_Skriv ut"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
-msgid "Cop_y to Address Book..."
-msgstr "_Kopier til adressebok..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
-msgid "Mo_ve to Address Book..."
-msgstr "_Flytt til adressebok..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
-msgid "Cu_t"
-msgstr "Klipp u_t"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
-#: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3178 ../mail/em-folder-tree.c:1004
-#: ../mail/em-folder-view.c:1134 ../mail/message-list.c:1922
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopier"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
-msgid "P_aste"
-msgstr "_Lim inn"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1660
-#: ../calendar/gui/cal-search-bar.c:428
-msgid "Any Category"
-msgstr "Enhver kategori"
-
-#: ../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/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.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:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-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: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:511
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
-msgid "Role"
-msgstr "Rolle"
-
-#. Translators: This is a vcard standard and stands for the type of
-#. phone used by the hearing impaired. TTY stands for "teletype"
-#. (familiar from Unix device names), and TDD is "Telecommunications
-#. Device for Deaf". However, you probably want to leave this
-#. abbreviation unchanged unless you know that there is actually a
-#. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "Teleks"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-msgid "Title"
-msgstr "Tittel"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Enhet"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Web Site"
-msgstr "Nettside"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-msgid "Work Email"
-msgstr "E-post på arbeid"
-
-#: ../addressbook/gui/widgets/e-minicard.c:103
-msgid "Home Email"
-msgstr "E-post hjemme"
-
-#: ../addressbook/gui/widgets/e-minicard.c:104
-msgid "Other Email"
-msgstr "Annen e-post"
-
-#: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3665 ../widgets/text/e-text.c:3666
-msgid "Width"
-msgstr "Bredde"
-
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
-msgid "Height"
-msgstr "Høyde"
-
-#: ../addressbook/gui/widgets/e-minicard.c:165
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: ../addressbook/gui/widgets/e-minicard.c:173
-msgid "Selected"
-msgstr "Valgt"
-
-#: ../addressbook/gui/widgets/e-minicard.c:180
-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:174
-msgid ""
-"\n"
-"\n"
-"Search for the Contact\n"
-"\n"
-"or double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Søk etter kontakten\n"
-"\n"
-"eller dobbelklikk her for å opprette en ny kontakt."
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
-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:182
-msgid ""
-"\n"
-"\n"
-"Search for the Contact."
-msgstr ""
-"\n"
-"\n"
-"Søk etter kontakten."
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
-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:501
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK-trevisning"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importerer..."
 
@@ -3846,10 +3838,10 @@ msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
 #: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser.c:91
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-header-item.c:1890
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1895
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Topptekst"
@@ -3903,7 +3895,6 @@ msgid "Options"
 msgstr "Alternativer"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Orientering"
 
@@ -4006,6 +3997,20 @@ msgstr "Test på utskrift av kontakt"
 msgid "This should test the contact print code"
 msgstr "Testfunksjon for utskrift av kontakter"
 
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "Kan ikke åpne fil"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunne ikke hente en liste med adressebøker"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "kunne ikke åpne adressebok"
+
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
@@ -4031,7 +4036,6 @@ msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
 msgid ""
 "The number of cards in out output file in asynchronous mode, default size "
 "100."
@@ -4064,32 +4068,6 @@ msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
-msgid "Can not open file"
-msgstr "Kan ikke åpne fil"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "Kunne ikke hente en liste med adressebøker"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
-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."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Innfil"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Ingen filnavn spesifisert."
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
@@ -4201,46 +4179,50 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
+
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:24
 msgid "Cannot create a new event"
 msgstr "Kan ikke opprette en ny hendelse"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "Slett kalender «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Delete memo list '{0}'?"
 msgstr "Slett notatliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Do _not Send"
 msgstr "Ikke se_nd"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Nedlasting pågår. Vil du lagre avtalen?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Nedlasting pågår. Vil du lagre oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4248,25 +4230,25 @@ msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
 "denne oppgaven."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "Feil under lasting av kalender"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading memo list"
 msgstr "Feil under lasting av notatliste"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Feil under lasting av oppgaveliste"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4274,7 +4256,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at journalen er slettet."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4282,7 +4264,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
 "er avlyst."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4290,7 +4272,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at oppgaven er slettet."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4298,7 +4280,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4306,7 +4288,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4314,7 +4296,7 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4322,83 +4304,83 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server."
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notater har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "The memo list is not marked for offline usage"
 msgstr "Notatlisten er ikke merket for frakoblet bruk"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagre dine endringer i denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagre dine endringer i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagre dine endringer i denne oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "Vil du sende en avlysingsmelding for denne journaloppføringen?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4408,7 +4390,7 @@ msgstr ""
 "muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
 "for å unngå problemer."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
@@ -4416,62 +4398,61 @@ msgstr ""
 "Du har valgt en skrivebeskyttet kalenderkilde. Bytt til kalendervisning og "
 "merk en kalender som kan motta avtaler."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endret denne avtalen, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endret denne oppgaven, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endret dette notatet, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Notatene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgavene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Oppgi passord"
 
@@ -4517,6 +4498,88 @@ msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
 
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2078
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1367
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgaver"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Konfigurasjonskontroll for Evolution kalender"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visning for møteplanlegging i Evolution kalender"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Redigering av kalender/oppgaver for Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalenderkomponent"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Notatkomponent for Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "Oppgavekomponent for Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "_Notater"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:324 ../calendar/gui/e-memos.c:1093
+#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:536
+#: ../calendar/gui/memos-component.c:1013 ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/memos-control.c:352
+msgid "Memos"
+msgstr "Notater"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
+#: ../calendar/gui/gnome-cal.c:1541 ../calendar/gui/print.c:1809
+#: ../calendar/gui/tasks-component.c:527
+#: ../calendar/gui/tasks-component.c:1018 ../calendar/gui/tasks-control.c:478
+#: ../calendar/gui/tasks-control.c:494
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:397
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:541
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "_Kalendere"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../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:112
 msgid "minute"
 msgid_plural "minutes"
@@ -4526,10 +4589,9 @@ msgstr[1] "minutter"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-weather/calendar-weather.c:562
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timer"
@@ -4546,8 +4608,8 @@ msgstr "Avtaler"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1623
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1629
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1571
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
 #: ../calendar/gui/e-itip-control.c:1145
 #: ../plugins/itip-formatter/itip-view.c:943
 msgid "Location:"
@@ -4559,13 +4621,13 @@ msgstr "Utsett-_tid:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:164
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
 #: ../ui/evolution.xml.h:41
@@ -4580,31 +4642,31 @@ msgstr "Ut_sett"
 msgid "location of appointment"
 msgstr "lokasjon for avtalen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1458
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1430
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1553
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1439
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1441
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1449
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1536
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1655
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1659
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4616,7 +4678,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4633,14 +4695,10 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1755
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 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:140
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
@@ -4682,160 +4740,160 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Varslingsprogrammer"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting av oppføringer"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Farge for oppgaver som går ut i dag i «#rrggbb»-format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Farge for oppgaver som har gått ut i «#rrggbb»-format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalendere det skal kjøres alarmer for"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge på Marcus Bains-linjen i tidslinjen (tom for forvalg)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Farge på Marcus Bains-linjen i dagsvisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "Bekreft tømming av mappe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dager som starten og slutten på arbeidstid skal være indikert."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "Forvalgt påminnelse for avtale"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "Forvalgt enhet for påminnelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "Forvalgt verdi for påminnelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "Katalog for lagring av lydfiler for alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "Gradient for hendelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "Gjennomsiktighet for hendelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "Tjener-URLer for ledig/opptatt-informasjon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "Ledig/opptatt mal-URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "Gradient for hendelser i kalendervisninger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Skjul fullførte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Skjul enheter for oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Skjul oppgaveverdi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Plassering på horisontalt felt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Klokkeslett arbeidsdagen slutter på i 24-timers format, 0 til 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Klokkeslett arbeidsdagen starter i 24-timers format, 0 til 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "Liste over tjener-URLer for publisering av ledig/opptatt tid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farge på Marcus Bains-linje - Dagsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farge på Marcus Bains-linje - tidslinje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minutt arbeidsdagen slutter på fra 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minutt arbeidsdagen starter på fra 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "Plassering på horisontal månedsvisningsfelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "Plassering av vertikalt felt for månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "Antall enheter for å bestemme en forvalgt påminnelse."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4843,7 +4901,7 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom minikalenderen og oppgavelisten "
 "utenom månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4851,13 +4909,13 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom visning, minikalender og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4865,7 +4923,7 @@ msgstr ""
 "Plassering av vertikalt felt mellom oppgavelisten og forhåndsvisningsfeltet "
 "for oppgaver, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4873,7 +4931,7 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4881,69 +4939,69 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten utenom månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmer som er tillat å kjøres av alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "Katalog for lagring av alarmlyd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Vis RSVP-feltet i redigering av hendelser/oppgaver/møter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Vis rollefelt i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Vis kategorifelt ved redigering av hendelse/møte/oppgave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "Vis alarmer i varslingsområdet på panelet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Vis statusfelt ved redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Show the \"Preview\" pane"
 msgstr "Vis forhåndsvisningsvinduet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Show the \"Preview\" pane."
 msgstr "Vis forhåndsvisningsvinduet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Vis tidssonefelt ved redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Vis typefelt ved redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "Vis ukenummer i datovelger"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "Posisjon for vertikalt oppgavefelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4952,7 +5010,7 @@ msgstr ""
 "URL-mal som brukes som reserveløsning for ledig/opptatt, %u er erstattet med "
 "brukerdelen av e-postadressen og %d er erstattet med domenet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4960,20 +5018,20 @@ msgstr ""
 "Den forvalgte tidssonen å bruke for datoer og tidspunkt i kalenderen som en "
 "uoversatt Olsen tidssonedatabaselokasjon som «America/New York»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for forrige alarm, som time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 #: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -4981,45 +5039,45 @@ msgstr ""
 "Gjennomsiktighet for hendelser i kalendervisningen (En verdi mellom 0 "
 "(gjennomsiktig) og 1 (ugjennomsiktig)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller "
 "«days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dag uken starter på. Fra søndag (0) til lørdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Om varslingsfeltet skal brukes for alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Om det skal spørres etter bekreftelse ved sletting av en avtale eller "
 "oppgave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Om det skal spørres etter bekreftelse ved tømming av avtaler eller oppgaver."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5027,86 +5085,139 @@ msgstr ""
 "Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
 "til en ukedag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Om tidspunktet en hendelse slutter på skal vises i uke- og månedsvisninger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Om Marcus Bains-linjen (linjen på nåværende tid) skal vises i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "Om en forvalgt påminnelse skal bli satt for avtaler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Om RSVP-feltet skal vises redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Om kategorifeltet skal vises i redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Om rollefeltet skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Om felt for tidssone skal vises i redigering av hendelse/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Om typefelt skal vises i redigering av hendelse/oppgave/møte"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Om «daylight savings time» skal brukes ved visning av hendelser."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "Hvilken time arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "Hvilket minutt arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "Hvilken time arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
+#: ../calendar/gui/cal-search-bar.c:71
+msgid "Summary contains"
+msgstr "Sammendrag inneholder"
+
+#: ../calendar/gui/cal-search-bar.c:72
+msgid "Description contains"
+msgstr "Beskrivelse inneholder"
+
+#: ../calendar/gui/cal-search-bar.c:73
+msgid "Category is"
+msgstr "Kategorien er"
+
+#: ../calendar/gui/cal-search-bar.c:74
+msgid "Comment contains"
+msgstr "Kommentar inneholder"
+
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Location contains"
+msgstr "Lokasjon inneholder"
+
+#: ../calendar/gui/cal-search-bar.c:650 ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:712
+msgid "Unmatched"
+msgstr "Ingen treff"
+
+#: ../calendar/gui/cal-search-bar.c:658
+msgid "Next 7 days Tasks"
+msgstr "Oppgaver for de neste 7 dagene"
+
+#: ../calendar/gui/cal-search-bar.c:662
+msgid "Active Tasks"
+msgstr "Aktive oppgaver"
+
+#: ../calendar/gui/cal-search-bar.c:666
+msgid "Over Due Tasks"
+msgstr "Utgåtte oppgaver"
+
+#: ../calendar/gui/cal-search-bar.c:670
+msgid "Completed Tasks"
+msgstr "Fullførte oppgaver"
+
+#: ../calendar/gui/cal-search-bar.c:674
+msgid "Tasks With Attachments"
+msgstr "Oppgaver med vedlegg"
+
+#: ../calendar/gui/cal-search-bar.c:720
+msgid "Active Appointments"
+msgstr "Aktive avtaler"
+
+#: ../calendar/gui/cal-search-bar.c:724
+msgid "Next 7 Day Appointments"
+msgstr "Avtaler for de neste 7 dagene"
+
 #: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
@@ -5127,10 +5238,9 @@ msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
 #: ../calendar/gui/calendar-commands.c:335
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:563
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "dager"
@@ -5139,94 +5249,89 @@ msgstr "dager"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:265
+#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:223
 msgid "On The Web"
 msgstr "På nettet"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Vær"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:588
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:905
 msgid "Failed upgrading calendars."
 msgstr "Feil under oppgradering av kalendere."
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1204
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1220
 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:1336
+#: ../calendar/gui/calendar-component.c:1342
 msgid "Calendar Source Selector"
 msgstr "Valg av kalenderkilde"
 
-#: ../calendar/gui/calendar-component.c:1361
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1550
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1551
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1552
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1558
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1559
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1560
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1566
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1567
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1568
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1574
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1575
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1576
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -5246,30 +5351,6 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: ../calendar/gui/cal-search-bar.c:55
-msgid "Summary contains"
-msgstr "Sammendrag inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:56
-msgid "Description contains"
-msgstr "Beskrivelse inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "Kategorien er"
-
-#: ../calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Kommentar inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:59
-msgid "Location contains"
-msgstr "Lokasjon inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:432
-msgid "Unmatched"
-msgstr "Ingen treff"
-
 #: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
@@ -5414,7 +5495,6 @@ msgstr "Varsel"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../composer/e-msg-composer-select-file.c:98
 #: ../composer/e-msg-composer-select-file.c:118
 msgid "_Suggest automatic display of attachment"
@@ -5424,87 +5504,6 @@ msgstr "Fore_slå automatisk visning av vedlegg"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:268
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:270
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Kopier oppgavelisten lokalt for frakoblet operasjon"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:272
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Kopier notatlisten lokalt for frakoblet operasjon"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:342
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "C_olor:"
-msgstr "F_arge:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-msgid "Task List"
-msgstr "Oppgaveliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-msgid "Memo List"
-msgstr "Notatliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:477
-msgid "Calendar Properties"
-msgstr "Kalenderegenskaper"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:479
-msgid "New Calendar"
-msgstr "Ny kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:564
-msgid "Task List Properties"
-msgstr "Egenskaper for oppgaveliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:630
-msgid "New Memo List"
-msgstr "Ny notatliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Legg til kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Legg til oppgaveliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Velg en farge"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Legg til kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Legg til oppgaveliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "_Oppdater:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "uker"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
@@ -5531,7 +5530,7 @@ msgstr ""
 "<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varsel</span>"
 
@@ -5540,7 +5539,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Forvalgt ledig/opptatt-tjener</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
@@ -5609,6 +5608,11 @@ msgstr ""
 "Lørdag\n"
 "Søndag"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Velg en farge"
+
 #. Sunday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "S_un"
@@ -5752,6 +5756,46 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:268
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
+msgid "Cop_y task list contents locally for offline operation"
+msgstr "Kopier oppgavelisten lokalt for frakoblet operasjon"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:272
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr "Kopier notatlisten lokalt for frakoblet operasjon"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:342
+msgid "C_olor:"
+msgstr "F_arge:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+msgid "Task List"
+msgstr "Oppgaveliste"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+msgid "Memo List"
+msgstr "Notatliste"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:477
+msgid "Calendar Properties"
+msgstr "Kalenderegenskaper"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:479
+msgid "New Calendar"
+msgstr "Ny kalender"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "Task List Properties"
+msgstr "Egenskaper for oppgaveliste"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:630
+msgid "New Memo List"
+msgstr "Ny notatliste"
+
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
@@ -5798,29 +5842,54 @@ 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.c:209 ../composer/e-msg-composer.c:2915
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfeil: %s"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
+msgid " to "
+msgstr " til "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
+msgid " (Completed "
+msgstr " (Fullført "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
+msgid "Completed "
+msgstr "Fullført "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
+msgid " (Due "
+msgstr " (Ferdig "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
+msgid "Due "
+msgstr "Ferdig "
+
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2914
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2920
-#: ../composer/e-msg-composer.c:3115
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2919
+#: ../composer/e-msg-composer.c:3114
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3179
-#: ../mail/em-folder-tree.c:1005 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1030 ../mail/message-list.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3178
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:1032 ../mail/message-list.c:1963
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3181
-#: ../mail/em-folder-tree.c:1007 ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3180
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:1965
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
@@ -5845,10 +5914,8 @@ msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../calendar/gui/dialogs/event-page.c:1889
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3686
+#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:3685
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5856,20 +5923,18 @@ msgid "_Remove"
 msgstr "Fje_rn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3687 ../mail/em-folder-tree.c:2107
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#: ../composer/e-msg-composer.c:3686 ../mail/em-folder-tree.c:2128
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
 msgid "_Properties"
 msgstr "Egenska_per..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3689
+#: ../composer/e-msg-composer.c:3688
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1556
-#: ../mail/em-format-html-display.c:2316
+#: ../mail/em-format-html-display.c:2315
 msgid "Show Attachments"
 msgstr "Vis vedlegg"
 
@@ -5877,89 +5942,63 @@ msgstr "Vis vedlegg"
 msgid "Press space key to toggle attachment bar"
 msgstr "Trykk mellomrom for å slå av/på vedleggsfeltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2164
-#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2163
+#: ../calendar/gui/dialogs/comp-editor.c:2206
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2169
+#: ../calendar/gui/dialogs/comp-editor.c:2212
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2172
-#: ../calendar/gui/dialogs/comp-editor.c:2215
+#: ../calendar/gui/dialogs/comp-editor.c:2171
+#: ../calendar/gui/dialogs/comp-editor.c:2214
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2175
+#: ../calendar/gui/dialogs/comp-editor.c:2218
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2178
-#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../calendar/gui/dialogs/comp-editor.c:2177
+#: ../calendar/gui/dialogs/comp-editor.c:2220
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2181
-#: ../calendar/gui/dialogs/comp-editor.c:2224
+#: ../calendar/gui/dialogs/comp-editor.c:2180
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2192
-#: ../calendar/gui/dialogs/comp-editor.c:2234
+#: ../calendar/gui/dialogs/comp-editor.c:2191
+#: ../calendar/gui/dialogs/comp-editor.c:2233
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2780
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:370
+#: ../calendar/gui/dialogs/comp-editor.c:2779 ../mail/em-utils.c:370
 #: ../widgets/misc/e-attachment-bar.c:350
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2869
-#: ../calendar/gui/dialogs/comp-editor.c:2923
-#: ../calendar/gui/dialogs/comp-editor.c:2947
+#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2922
+#: ../calendar/gui/dialogs/comp-editor.c:2946
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2976
+#: ../calendar/gui/dialogs/comp-editor.c:2975
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfeil: %s"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
-msgid " to "
-msgstr " til "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
-msgid " (Completed "
-msgstr " (Fullført "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
-msgid "Completed "
-msgstr "Fullført "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
-msgid " (Due "
-msgstr " (Ferdig "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
-msgid "Due "
-msgstr "Ferdig "
-
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Kunne ikke åpne kilde"
@@ -6046,12 +6085,12 @@ msgstr "Av_tale"
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: ../calendar/gui/dialogs/event-page.c:801
-#: ../calendar/gui/dialogs/event-page.c:2704
+#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:2711
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6059,94 +6098,94 @@ msgstr "Denne hendelsen har varsel"
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:911
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:913
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1078
+#: ../calendar/gui/dialogs/event-page.c:1083
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1081
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1250
+#: ../calendar/gui/dialogs/event-page.c:1255
 #: ../calendar/gui/dialogs/memo-page.c:685
 #: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1265
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1283
+#: ../calendar/gui/dialogs/event-page.c:1288
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1290
+#: ../calendar/gui/dialogs/event-page.c:1295
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1447
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/memo-page.c:720
 #: ../calendar/gui/dialogs/task-page.c:906
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/memo-page.c:726
 #: ../calendar/gui/dialogs/task-page.c:912
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1468
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/task-page.c:927
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1890
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/task-page.c:1202
 msgid "_Add "
 msgstr "_Legg til"
 
-#: ../calendar/gui/dialogs/event-page.c:2611
+#: ../calendar/gui/dialogs/event-page.c:2618
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2917
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2923
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2929
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2949
 msgid "Customize"
 msgstr "Tilpass"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:2954
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
 #: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2314
@@ -6157,8 +6196,8 @@ msgstr "Tilpass"
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1503
-#: ../widgets/misc/e-dateedit.c:1717
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1718
 msgid "None"
 msgstr "Ingen"
 
@@ -6188,7 +6227,6 @@ msgid "Custom Alarm:"
 msgstr "Egendefinert varsel:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
 
@@ -6224,56 +6262,6 @@ msgstr "for"
 msgid "until"
 msgstr "til"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Deltaker"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klikk her for å legge til en deltaker"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Vanlig navn"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegert fra"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegert til"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Språk"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Medlem"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Status"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>D_eltakere</b> "
@@ -6304,8 +6292,8 @@ msgstr "Notat"
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format.c:849
-#: ../mail/em-format-html.c:1492 ../mail/em-format-quote.c:200
+#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
 msgid "To"
 msgstr "Til"
@@ -6329,42 +6317,6 @@ msgstr "_Beskrivelse:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Kalenderalternativer</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Legg til ny kalender"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Kalendergruppe"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Kalenderlokasjon"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Kalendernavn"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>Alternativer for oppgaveliste</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Legg til ny oppgaveliste"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Oppgavelistegruppe"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Navn på oppgaveliste"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du endrer en repeterende hendelse. Hva ønsker du å endre?"
@@ -6382,19 +6334,19 @@ msgid ""
 "You are modifying a recurring journal entry. What would you like to modify?"
 msgstr "Du endrer en repeterende journaloppføring. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Denne og tidligere instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Alle instanser"
 
@@ -6590,12 +6542,11 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-calendar-table.c:463
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-itip-control.c:923 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217 ../calendar/gui/print.c:2348
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Fullført"
 
@@ -6607,10 +6558,10 @@ msgstr "Høy"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:230
-#: ../calendar/gui/e-calendar-table.c:462
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735 ../calendar/gui/print.c:2345
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2345
 msgid "In Progress"
 msgstr "Under arbeid"
 
@@ -6622,16 +6573,16 @@ msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
 #: ../mail/message-list.c:1033
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-calendar-table.c:461
 #: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658 ../calendar/gui/print.c:2342
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -6662,7 +6613,7 @@ msgid "_Web Page:"
 msgstr "_Nettside:"
 
 #: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/tasks-component.c:1250
 msgid "_Task"
 msgstr "_Oppgave"
 
@@ -6674,7 +6625,7 @@ msgstr "Oppgavedetaljer"
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1648
+#: ../calendar/gui/dialogs/task-page.c:1650
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -6687,6 +6638,10 @@ msgstr "De_ltakere..."
 msgid "Categor_ies..."
 msgstr "Kategor_ier..."
 
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr "Be_skrivelse:"
+
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "Or_ganisator:"
@@ -6699,49 +6654,6 @@ msgstr "Tids_sone:"
 msgid "_Due date:"
 msgstr "Fer_dig-dato:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Ledig/opptatt-k_alendere</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Publiseringsfrekvens</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Lokasjon for publisering</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Innstillinger for publisering av ledig/opptatt-tid"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Daglig"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Manuell"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Passord:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "Hu_sk passord"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "Br_ukernavn:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "_Ukentlig"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6819,7 +6731,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:2897
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:2934
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
@@ -6838,14 +6750,13 @@ msgstr "Startdato:"
 #: ../calendar/gui/e-cal-component-memo-preview.c:221
 #: ../calendar/gui/e-cal-component-preview.c:271
 #: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:67 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivelse:"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:254
-#: ../calendar/gui/e-cal-component-preview.c:303
+#: ../calendar/gui/e-cal-component-preview.c:304
 msgid "Web Page:"
 msgstr "Nettside:"
 
@@ -6872,22 +6783,130 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-calendar-table.c:366
 #: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "Offentlig"
 
-#: ../calendar/gui/e-calendar-table.c:367
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/e-calendar-table.c:368
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "Konfidensiell"
 
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Sluttdato"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.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
+#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:440
+msgid "Free"
+msgstr "Ledig"
+
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-meeting-time-sel.c:411
+msgid "Busy"
+msgstr "Opptatt"
+
+#: ../calendar/gui/e-cal-model-tasks.c:610
+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:930
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:764
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "Ja"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:178
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "Nei"
+
+#. This is the default filename used for temporary file creation
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1204
+#: ../plugins/itip-formatter/itip-formatter.c:240
+#: ../plugins/itip-formatter/itip-formatter.c:1800
+#: ../plugins/plugin-manager/plugin-manager.c:77
+#: ../widgets/misc/e-attachment-bar.c:712
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../calendar/gui/e-cal-model.c:926
+msgid "Recurring"
+msgstr "Gjeninntreffer"
+
+#: ../calendar/gui/e-cal-model.c:928
+msgid "Assigned"
+msgstr "Tildelt"
+
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:417
+msgid "Save As..."
+msgstr "Lagre som..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2160
+msgid "Select folder to save selected attachments..."
+msgstr "Velg mappe å lagre valgte vedlegg i..."
+
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:442
+#, c-format
+msgid "untitled_image.%s"
+msgstr "bilde_uten_navn.%s"
+
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1147 ../mail/em-popup.c:559 ../mail/em-popup.c:570
+msgid "_Save As..."
+msgstr "Lagre _som..."
+
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:560
+#: ../mail/em-popup.c:571
+msgid "Set as _Background"
+msgstr "Sett som _bakgrunn"
+
+#: ../calendar/gui/e-cal-popup.c:278
+msgid "_Save Selected"
+msgstr "_Lagre utvalg"
+
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:779
+#, c-format
+msgid "Open in %s..."
+msgstr "Åpne i %s..."
+
 #: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
@@ -6932,32 +6951,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-cal-model-calendar.c:183
-msgid "Free"
-msgstr "Ledig"
-
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-meeting-time-sel.c:411
-msgid "Busy"
-msgstr "Opptatt"
-
-#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1509
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/print.c:1809 ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:478
-#: ../calendar/gui/tasks-control.c:494
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Oppgaver"
-
 #: ../calendar/gui/e-calendar-table.c:705
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
 msgid "Deleting selected objects"
@@ -6983,17 +6976,10 @@ msgstr "Ny _oppgave"
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-cal-popup.c:276
-#: ../calendar/gui/e-memo-table.c:904 ../mail/em-folder-view.c:1144
-#: ../mail/em-popup.c:554 ../mail/em-popup.c:565
-msgid "_Save As..."
-msgstr "Lagre _som..."
-
 #: ../calendar/gui/e-calendar-table.c:1284
 #: ../calendar/gui/e-calendar-view.c:1665
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:905
-#: ../mail/em-folder-view.c:1145
+#: ../mail/em-folder-view.c:1148
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7056,7 +7042,7 @@ msgstr "Klikk for å legge til en oppgave"
 msgid "% Complete"
 msgstr "% ferdig"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:705
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:691
 msgid "Complete"
 msgstr "Fullført"
 
@@ -7077,12 +7063,12 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Summary"
-msgstr "Sammendrag"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:16
+msgid "Status"
+msgstr "Status"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
@@ -7145,8 +7131,8 @@ msgstr "_Videresend som iCalendar..."
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1139
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1141
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svar til _alle"
@@ -7164,114 +7150,29 @@ msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2156
+#: ../calendar/gui/e-calendar-view.c:2158
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2160
+#: ../calendar/gui/e-calendar-view.c:2162
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2176 ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2178 ../calendar/gui/print.c:2316
 #, c-format
 msgid "Location: %s"
 msgstr "Plassering: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2207
+#: ../calendar/gui/e-calendar-view.c:2209
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Start Date"
-msgstr "Startdato"
-
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../calendar/gui/e-cal-model.c:926
-msgid "Recurring"
-msgstr "Gjeninntreffer"
-
-#: ../calendar/gui/e-cal-model.c:928
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: ../calendar/gui/e-cal-model.c:930 ../calendar/gui/e-cal-model-tasks.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
-msgid "Yes"
-msgstr "Ja"
-
-#: ../calendar/gui/e-cal-model.c:930 ../calendar/gui/e-cal-model-tasks.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "No"
-msgstr "Nei"
-
-#: ../calendar/gui/e-cal-model-tasks.c:610
-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-popup.c:177 ../mail/em-popup.c:412
-msgid "Save As..."
-msgstr "Lagre som..."
-
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2161
-msgid "Select folder to save selected attachments..."
-msgstr "Velg mappe å lagre valgte vedlegg i..."
-
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
-#, c-format
-msgid "untitled_image.%s"
-msgstr "bilde_uten_navn.%s"
-
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
-msgid "Set as _Background"
-msgstr "Sett som _bakgrunn"
-
-#: ../calendar/gui/e-cal-popup.c:278
-msgid "_Save Selected"
-msgstr "_Lagre utvalg"
-
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "Åpne i %s..."
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
@@ -7291,17 +7192,14 @@ msgstr ""
 "Datoen må skrives inn på formatet: \n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
-msgid "pm"
-msgstr "pm"
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:807
+#, 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.
@@ -7309,21 +7207,24 @@ msgstr "pm"
 #. 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:2089
 #: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * to change the length of the time division in the calendar day view, e.g.
-#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
-#.
-#: ../calendar/gui/e-day-view-time-item.c:807
-#, 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:746 ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+msgid "pm"
+msgstr "pm"
 
 #: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
@@ -7710,41 +7611,41 @@ msgstr "Oppføring sendt!\n"
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: ../calendar/gui/e-itip-control.c:2220
+#: ../calendar/gui/e-itip-control.c:2223
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
-#: ../calendar/gui/e-itip-control.c:2292
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2320
+#: ../calendar/gui/e-itip-control.c:2324
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2325
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2326
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2355
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2379
+#: ../calendar/gui/e-itip-control.c:2383
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: ../calendar/gui/e-itip-control.c:2407
+#: ../calendar/gui/e-itip-control.c:2411
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2435 ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:710
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7801,8 +7702,8 @@ msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config.glade.h:6
 #: ../widgets/table/e-table-config-no-group.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Gruppe"
 
@@ -7861,11 +7762,39 @@ msgstr "Delegert"
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../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:464
+#: ../calendar/gui/e-meeting-time-sel.c:2116
+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.
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:2149
+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:472
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
@@ -7929,30 +7858,48 @@ msgstr "_Start-tid:"
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#. 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:2116
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Deltaker"
 
-#. 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.
-#: ../calendar/gui/e-meeting-time-sel.c:2149
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-msgid "%a %m/%d/%Y"
-msgstr "%a %d.%m.%Y"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klikk her for å legge til en deltaker"
 
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Vanlig navn"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegert fra"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegert til"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Språk"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Medlem"
+
+#: ../calendar/gui/e-memo-table.c:920
+msgid "_Delete Selected Memos"
+msgstr "Sle_tt valgte notater"
+
+#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Klikk for å legge til et notat"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr "Sorter notat"
 
 #: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2778
+#: ../calendar/gui/gnome-cal.c:2826
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7974,32 +7921,6 @@ msgstr "Åpner notat på %s"
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-memo-table.c:324
-#: ../calendar/gui/gnome-cal.c:1637
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:336
-#: ../calendar/gui/memos-control.c:352
-msgid "Memos"
-msgstr "Notater"
-
-#: ../calendar/gui/e-memo-table.c:920
-msgid "_Delete Selected Memos"
-msgstr "Sle_tt valgte notater"
-
-#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
-msgid "Click to add a memo"
-msgstr "Klikk for å legge til et notat"
-
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Sorter notat"
-
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Oppgi passord for %s"
-
 #: ../calendar/gui/e-tasks.c:894
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
@@ -8029,96 +7950,46 @@ msgstr "Velg tidssone"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:824
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2477
 msgid "_Custom View"
 msgstr "_Egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2430
+#: ../calendar/gui/gnome-cal.c:2478
 msgid "_Save Custom View"
 msgstr "_Lagre egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2435
+#: ../calendar/gui/gnome-cal.c:2483
 msgid "_Define Views..."
 msgstr "_Definer visninger..."
 
-#: ../calendar/gui/gnome-cal.c:2601
+#: ../calendar/gui/gnome-cal.c:2649
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:2620
+#: ../calendar/gui/gnome-cal.c:2668
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: ../calendar/gui/gnome-cal.c:2629
+#: ../calendar/gui/gnome-cal.c:2677
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Laster notat på %s"
 
-#: ../calendar/gui/gnome-cal.c:2737
+#: ../calendar/gui/gnome-cal.c:2785
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: ../calendar/gui/gnome-cal.c:3673
+#: ../calendar/gui/gnome-cal.c:3724
 msgid "Purging"
 msgstr "Sletter"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2078
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgaver"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgaver"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Konfigurasjonskontroll for Evolution kalender"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visning for møteplanlegging i Evolution kalender"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Redigering av kalender/oppgaver for Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalenderkomponent"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Notatkomponent for Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Oppgavekomponent for Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "_Notater"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Kalendere"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Oppgaver"
-
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -8229,74 +8100,74 @@ msgstr "iCalendar-informasjon"
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:456
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:532
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:581
 msgid "Failed upgrading memos."
 msgstr "Feil under oppgradering av notater."
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:879
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne notatliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:892
 msgid "There is no calendar available for creating memos"
 msgstr "Ingen kalender tilgjengelig for opppretting av notater"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:988
 msgid "Memo Source Selector"
 msgstr "Valgt av notatkilde"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1171
 msgid "New memo"
 msgstr "Nytt notat"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1172
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1173
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1179
 msgid "New shared memo"
 msgstr "Nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1180
 msgid "_Shared memo"
 msgstr "_Delt notat"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1181
 msgid "Create a shared new memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1187
 msgid "New memo list"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1188
 msgid "Memo li_st"
 msgstr "Notatli_ste"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1189
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
@@ -8329,26 +8200,26 @@ msgstr ""
 "Vennligst vent mens Evolution migrere dine mapper..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:809
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
 
-#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../calendar/gui/migration.c:1226
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:398
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:429
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:542
 msgid "Notes"
 msgstr "Notater"
 
@@ -8552,63 +8423,63 @@ msgstr "Kontakter: "
 msgid "Upcoming Appointments"
 msgstr "Kommende avtaler"
 
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:447
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:523
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:572
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:883
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:896
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:993
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1249
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1251
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1257
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1258
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1259
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1265
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Tas_k list"
 msgstr "Oppgave_liste"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1267
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
@@ -10204,126 +10075,6 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "Vedleggsfelt"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Kan ikke legge ved fil: %s: %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Egenskaper for vedlegg"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: ../composer/e-msg-composer.c:830
-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:837
-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:1297 ../composer/e-msg-composer.c:2559
-msgid "Hide _Attachment Bar"
-msgstr "Skjul ve_dleggsfelt"
-
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2562
-#: ../composer/e-msg-composer.c:3932
-msgid "Show _Attachment Bar"
-msgstr "Vis ve_dleggsfelt"
-
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
-#: ../plugins/mail-remote/e-corba-utils.c:135
-msgid "Unknown reason"
-msgstr "Ukjent årsak"
-
-#: ../composer/e-msg-composer.c:1404
-msgid "Could not open file"
-msgstr "Kunne ikke åpne fil"
-
-#: ../composer/e-msg-composer.c:1412
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikke hente melding fra editor"
-
-#: ../composer/e-msg-composer.c:1697
-msgid "Untitled Message"
-msgstr "Melding uten navn"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
-msgid "Open File"
-msgstr "Åpne fil"
-
-#: ../composer/e-msg-composer.c:2194 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Generert automatisk"
-
-#: ../composer/e-msg-composer.c:2297
-msgid "Si_gnature:"
-msgstr "Si_gnatur:"
-
-#: ../composer/e-msg-composer.c:2573 ../composer/e-msg-composer.c:3814
-#: ../composer/e-msg-composer.c:3817
-msgid "Compose Message"
-msgstr "Skriv melding"
-
-#: ../composer/e-msg-composer.c:5042
-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 som ikke "
-"kan redigeres.)<b>"
-
 #: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "Destinasjon for post"
@@ -10412,6 +10163,74 @@ msgstr "Le_gg ved"
 msgid "Insert Attachment"
 msgstr "Sett inn vedlegg"
 
+#: ../composer/e-msg-composer.c:830
+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:837
+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:1297 ../composer/e-msg-composer.c:2559
+msgid "Hide _Attachment Bar"
+msgstr "Skjul ve_dleggsfelt"
+
+#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2562
+#: ../composer/e-msg-composer.c:3931
+msgid "Show _Attachment Bar"
+msgstr "Vis ve_dleggsfelt"
+
+#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../plugins/mail-remote/e-corba-utils.c:135
+msgid "Unknown reason"
+msgstr "Ukjent årsak"
+
+#: ../composer/e-msg-composer.c:1404
+msgid "Could not open file"
+msgstr "Kunne ikke åpne fil"
+
+#: ../composer/e-msg-composer.c:1412
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente melding fra editor"
+
+#: ../composer/e-msg-composer.c:1697
+msgid "Untitled Message"
+msgstr "Melding uten navn"
+
+#. NB: This function is never used anymore
+#: ../composer/e-msg-composer.c:1732
+msgid "Open File"
+msgstr "Åpne fil"
+
+#: ../composer/e-msg-composer.c:2194 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
+msgid "Autogenerated"
+msgstr "Generert automatisk"
+
+#: ../composer/e-msg-composer.c:2297
+msgid "Si_gnature:"
+msgstr "Si_gnatur:"
+
+#: ../composer/e-msg-composer.c:2573 ../composer/e-msg-composer.c:3813
+#: ../composer/e-msg-composer.c:3816
+msgid "Compose Message"
+msgstr "Skriv melding"
+
+#: ../composer/e-msg-composer.c:5041
+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 som ikke "
+"kan redigeres.)<b>"
+
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
@@ -10564,7 +10383,7 @@ msgstr "_Lagre melding"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:507
+#: ../shell/main.c:508
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10584,115 +10403,6 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Du er nå registrert som «Ute av kontoret». </b>\n"
-"\n"
-"Ønsker du å endre status til «Inne»?"
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Melding ved fravær:</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b> "
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Meldingen spesifisert under vil sendes automatisk til alle som sender "
-"deg\n"
-"e-post mens du er borte fra kontoret.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Jeg er inne"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Jeg er borte"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "Nei, ikke endre status"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Fraværsassistent"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Ja, endre status"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Innkommende e-post</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Utgående e-post:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>Her kan du velge om du vil motta meldinger via en lesekvittering når "
-"en melding du\n"
-"har sendt blir lest, og oppgi hva Evolution skal gjøre når noen ber om en "
-"kvittering ra deg.</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "Alltid send en lesekvittering tilbake"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Spør meg om jeg vil sende en kvittering tilbake"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "Aldri send en kvittering tilbake"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "Lesekvittering"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "Spør etter lesekvittering for alle meldinger jeg sender"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr ""
-"Med mindre meldingen sendes til en e-postliste, og ikke til meg personlig"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"Hva skal Evolution gjøre når du mottar en e-post med en forespørsel om "
-"lesekvittering?"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Evolution feil"
@@ -10715,22 +10425,18 @@ msgstr "Evolution spørring"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern feil, ukjent feil «%s» forespurt"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "Orientering for trauet."
-
 #: ../e-util/e-print.c:115
 msgid "An error occurred while printing"
-msgstr ""
+msgstr "En feil oppsto under utskrift"
 
 #: ../e-util/e-print.c:122
 msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "Utskriftssystemet rapporterte følgende detaljer om feilen:"
 
 #: ../e-util/e-print.c:128
 msgid ""
 "The printing system did not report any additional details about the error."
-msgstr ""
+msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10752,76 +10458,200 @@ msgstr "Filen &quot;{0}&quot; eksisterer."
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "om 1 minutt"
+msgstr[1] "om %d minutter"
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "om 1 time"
+msgstr[1] "om %d timer"
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "om 1 dag"
+msgstr[1] "om %d dager"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "om 1 måned"
+msgstr[1] "om %d måneder"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "Om 1 år"
+msgstr[1] "Om %d år"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:449
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
+#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+msgid "Choose a file"
+msgstr "Velg en fil"
+
+#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:91
+msgid "Important"
+msgstr "Viktig"
+
+#. forest green
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:150
+msgid "To Do"
+msgstr "Oppgaver"
+
+#. blue
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
+#: ../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:799
+msgid "_Search name:"
+msgstr "_Søkenavn:"
+
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr "Finn oppføringer som møter følgende kriterier"
+
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr "Hvis alle kriterier er møtt"
+
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr "Hvis noe kriterie er møtt"
+
+#: ../filter/filter-rule.c:868
+msgid "_Find items:"
+msgstr "_Finn oppføringer:"
+
+#: ../filter/filter-rule.c:890
+msgid "All related"
+msgstr "Alle relaterte"
+
+#: ../filter/filter-rule.c:890
+msgid "Replies"
+msgstr "Svar"
+
+#: ../filter/filter-rule.c:890
+msgid "Replies and parents"
+msgstr "Svar med opphav"
+
+#: ../filter/filter-rule.c:890
+msgid "No reply or parent"
+msgstr "Ingen svar eller opphav"
+
+#: ../filter/filter-rule.c:892
+msgid "I_nclude threads"
+msgstr "Ta _med tråder"
+
+#: ../filter/filter-rule.c:988 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:307
+msgid "Incoming"
+msgstr "Innkommende"
+
+#: ../filter/filter-rule.c:988 ../mail/em-utils.c:308
+msgid "Outgoing"
+msgstr "Utgående"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
@@ -10842,7 +10672,7 @@ msgstr "Mangler dato."
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -10866,10 +10696,6 @@ msgstr "Du må gi navn til dette filteret."
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
 
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
-msgid "Choose a file"
-msgstr "Velg en fil"
-
 #: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filterregler</b>"
@@ -10878,11 +10704,6 @@ msgstr "<b>_Filterregler</b>"
 msgid "Compare against"
 msgstr "Sammenligne med"
 
-#: ../filter/filter.glade.h:3 ../filter/filter-rule.c:988
-#: ../mail/em-utils.c:307
-msgid "Incoming"
-msgstr "Innkommende"
-
 #: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
 msgstr "Vis filtre for e-post:"
@@ -10919,102 +10740,110 @@ msgstr "en tid relativ til tiden nå"
 msgid "ago"
 msgstr "siden"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr "i fremtiden"
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:186
 msgid "seconds"
 msgstr " sekunder"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "tiden nå"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "tiden du spesifiserer"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "weeks"
+msgstr "uker"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "år"
 
-#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Viktig"
-
-#. forest green
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Oppgaver"
+#: ../filter/rule-editor.c:378
+msgid "Add Rule"
+msgstr "Legg til regel"
 
-#. blue
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "Senere"
+#: ../filter/rule-editor.c:454
+msgid "Edit Rule"
+msgstr "Rediger regel"
 
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: ../filter/rule-editor.c:732
+msgid "Rule name"
+msgstr "Regelnavn"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "_Søkenavn:"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Brukervalg for redigering"
 
-#: ../filter/filter-rule.c:827
-msgid "Find items that meet the following criteria"
-msgstr "Finn oppføringer som møter følgende kriterier"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: ../filter/filter-rule.c:866
-msgid "If all criteria are met"
-msgstr "Hvis alle kriterier er møtt"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: ../filter/filter-rule.c:866
-msgid "If any criteria are met"
-msgstr "Hvis noe kriterie er møtt"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurer e-post-kontoer her"
 
-#: ../filter/filter-rule.c:868
-msgid "_Find items:"
-msgstr "_Finn oppføringer:"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: ../filter/filter-rule.c:890
-msgid "All related"
-msgstr "Alle relaterte"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: ../filter/filter-rule.c:890
-msgid "Replies"
-msgstr "Svar"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
 
-#: ../filter/filter-rule.c:890
-msgid "Replies and parents"
-msgstr "Svar med opphav"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigering"
 
-#: ../filter/filter-rule.c:890
-msgid "No reply or parent"
-msgstr "Ingen svar eller opphav"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
-#: ../filter/filter-rule.c:892
-msgid "I_nclude threads"
-msgstr "Ta _med tråder"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: ../filter/filter-rule.c:988 ../mail/em-utils.c:308
-msgid "Outgoing"
-msgstr "Utgående"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:525
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:582 ../mail/mail-component.c:583
+#: ../mail/mail-component.c:738
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "E-post"
 
-#: ../filter/rule-editor.c:378
-msgid "Add Rule"
-msgstr "Legg til regel"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:532
+msgid "Mail Accounts"
+msgstr "E-post-konti"
 
-#: ../filter/rule-editor.c:454
-msgid "Edit Rule"
-msgstr "Rediger regel"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:100
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
 
-#: ../filter/rule-editor.c:732
-msgid "Rule name"
-msgstr "Regelnavn"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_E-post"
 
 #: ../mail/em-account-editor.c:403
 #, c-format
@@ -11043,11 +10872,11 @@ msgstr "Velg mappe"
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:119
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
@@ -11055,16 +10884,16 @@ msgstr "Innkommende e-post"
 msgid "Automatically check for _new mail every"
 msgstr "Se etter _nye meldinger automatisk"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:134
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:65
+#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:66
 msgid "Defaults"
 msgstr "Forvalg"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sikkerhet"
@@ -11078,11 +10907,11 @@ msgstr "Alternativer for mottak"
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:31
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:32
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
@@ -11101,9 +10930,8 @@ msgstr "Aktiver"
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:945
-#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/plugin-manager/plugin-manager.c:261
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Aktivert"
@@ -11116,11 +10944,6 @@ msgstr "Kontonavn"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-account-prefs.c:532
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Mail Accounts"
-msgstr "E-post-konti"
-
 #: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
 #: ../mail/mail-config.c:1029
 msgid "Unnamed"
@@ -11157,6 +10980,10 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
+#: ../mail/em-composer-utils.c:1853
+msgid "-----Original Message-----"
+msgstr "-----Opprinnelig melding-----"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "_Filterregler"
@@ -11294,7 +11121,7 @@ msgstr "er ikke"
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Uønsket e-post"
@@ -11411,8 +11238,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format.c:852
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:313
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:854
 #: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:6
@@ -11429,51 +11256,51 @@ msgstr "Nullstill status"
 msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:171
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk..."
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:193
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:196
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:203
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:204
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:205
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:206
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:207
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:208
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../mail/em-folder-browser.c:1030
+#: ../mail/em-folder-browser.c:1031
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../mail/em-folder-browser.c:1074
+#: ../mail/em-folder-browser.c:1075
 msgid "All Account Search"
 msgstr "Søk i alle kontoer"
 
@@ -11509,6 +11336,39 @@ msgstr "Opprett"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+msgid "Search Folders"
+msgstr "Søkemapper"
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+msgid "UNMATCHED"
+msgstr "UTEN TREFF"
+
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+msgid "Drafts"
+msgstr "Skisser"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2415
+#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Innboks"
+
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+msgid "Outbox"
+msgstr "Utboks"
+
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+msgid "Sent"
+msgstr "Sendt"
+
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+msgid "Loading..."
+msgstr "Laster..."
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. "%s" will be replaced by
 #. * the folder's name and "%u" will be replaced with the
@@ -11524,130 +11384,105 @@ msgstr "Mappe_navn:"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:367
+#: ../mail/em-folder-tree.c:368
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:719
+#: ../mail/em-folder-tree.c:720
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:880
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:882
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:889 ../mail/message-list.c:1867
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:890 ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:891 ../mail/message-list.c:1869
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:906
+#: ../mail/em-folder-tree.c:907
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:1002 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1708 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2091 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2109 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:58 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:53
 msgid "_View"
 msgstr "_Vis"
 
-#: ../mail/em-folder-tree.c:2092
+#: ../mail/em-folder-tree.c:2110
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2119
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2104 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../mail/em-folder-tree.c:2109 ../mail/mail.error.xml.h:131
-msgid "_Empty Trash"
-msgstr "_Tøm papirkurven"
+#: ../mail/em-folder-tree.c:2123
+msgid "Re_fresh"
+msgstr "O_ppdater"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
-msgid "Search Folders"
-msgstr "Søkemapper"
+#: ../mail/em-folder-tree.c:2124
+msgid "Fl_ush Outbox"
+msgstr "T_øm utboks"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
-msgid "UNMATCHED"
-msgstr "UTEN TREFF"
-
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
-msgid "Drafts"
-msgstr "Skisser"
-
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
-msgid "Inbox"
-msgstr "Innboks"
-
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
-msgid "Outbox"
-msgstr "Utboks"
-
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
-msgid "Sent"
-msgstr "Sendt"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
-msgid "Loading..."
-msgstr "Laster..."
+#: ../mail/em-folder-tree.c:2130 ../mail/mail.error.xml.h:136
+msgid "_Empty Trash"
+msgstr "_Tøm papirkurven"
 
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1030
-#: ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1032
+#: ../mail/em-folder-view.c:1047
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1047
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -11669,316 +11504,156 @@ msgstr "Opprett mappe"
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-view.c:523 ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:581
-#: ../mail/mail-component.c:582 ../mail/mail-component.c:724
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "E-post"
-
-#: ../mail/em-folder-view.c:966 ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:968 ../mail/mail.error.xml.h:68
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:969 ../mail/mail.error.xml.h:123
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../mail/em-folder-view.c:1138 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1140 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-folder-view.c:1140 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1142 ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/em-folder-view.c:1143 ../ui/evolution-mail-message.xml.h:107
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1146 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1152
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1153
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1154
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1157
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1158
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1159
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1160
 msgid "Mark as Un_important"
 msgstr "Merk som uv_iktig"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1161
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1162
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1163
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1165
 msgid "_Label"
 msgstr "_Etikett"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1163 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1166 ../widgets/misc/e-dateedit.c:473
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1171
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1172
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1175
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: ../mail/em-folder-view.c:1173
+#: ../mail/em-folder-view.c:1176
 msgid "Search Folder from _Subject"
 msgstr "Søkemappe på e_mne"
 
-#: ../mail/em-folder-view.c:1174
+#: ../mail/em-folder-view.c:1177
 msgid "Search Folder from Se_nder"
 msgstr "Søkemappe på se_nder"
 
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1178
 msgid "Search Folder from _Recipients"
 msgstr "Søkemappe på mottake_re"
 
-#: ../mail/em-folder-view.c:1176
+#: ../mail/em-folder-view.c:1179
 msgid "Search Folder from Mailing _List"
 msgstr "Søkemappe på e-post_liste"
 
-#: ../mail/em-folder-view.c:1180
+#: ../mail/em-folder-view.c:1183
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1184
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1185
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1186
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2036 ../mail/em-folder-view.c:2080
+#: ../mail/em-folder-view.c:2055 ../mail/em-folder-view.c:2099
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:2293
+#: ../mail/em-folder-view.c:2312
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/em-folder-view.c:2314
+#: ../mail/em-folder-view.c:2333
 msgid "<b>Retrieving Message...</b>"
 msgstr "<b>Henter melding...</b>"
 
-#: ../mail/em-folder-view.c:2353
-msgid "Retrieving Message"
-msgstr "Henter melding"
-
-#: ../mail/em-folder-view.c:2531
+#: ../mail/em-folder-view.c:2550
 msgid "Create _Search Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../mail/em-folder-view.c:2532
+#: ../mail/em-folder-view.c:2551
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2533
+#: ../mail/em-folder-view.c:2552
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:2890
+#: ../mail/em-folder-view.c:2927
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../mail/em-folder-view.c:2895
+#: ../mail/em-folder-view.c:2932
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../mail/em-format.c:847 ../mail/em-format-html.c:1492
-#: ../mail/em-format-quote.c:200 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "Fra"
-
-#: ../mail/em-format.c:848 ../mail/em-format-html.c:1492
-#: ../mail/em-format-quote.c:200 ../mail/em-mailer-prefs.c:88
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: ../mail/em-format.c:850 ../mail/em-format-html.c:1492
-#: ../mail/em-format-quote.c:200 ../mail/em-mailer-prefs.c:90
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format.c:851 ../mail/em-format-html.c:1492
-#: ../mail/em-format-quote.c:200 ../mail/em-mailer-prefs.c:91
-msgid "Bcc"
-msgstr "Bcc"
-
-#: ../mail/em-format.c:853 ../mail/em-format-html.c:1707
-#: ../mail/em-format-quote.c:329 ../mail/em-mailer-prefs.c:93
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date"
-msgstr "Dato"
-
-#: ../mail/em-format.c:854 ../mail/em-format-html.c:1730
-#: ../mail/em-mailer-prefs.c:94
-msgid "Newsgroups"
-msgstr "Nyhetsgrupper"
-
-#: ../mail/em-format.c:1118
-#, c-format
-msgid "%s attachment"
-msgstr "%s-vedlegg"
-
-#: ../mail/em-format.c:1157 ../mail/em-format.c:1308 ../mail/em-format.c:1610
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
-
-#: ../mail/em-format.c:1290 ../mail/em-format.c:1446
-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 encryption type for multipart/encrypted"
-msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
-
-#: ../mail/em-format.c:1465
-msgid "Unsupported signature format"
-msgstr "Ustøttet signaturformat"
-
-#: ../mail/em-format.c:1473 ../mail/em-format.c:1539
-msgid "Error verifying signature"
-msgstr "Feil under verifisering av signatur"
-
-#: ../mail/em-format.c:1473 ../mail/em-format.c:1539
-msgid "Unknown error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
-#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Henter «%s»"
-
-#: ../mail/em-format-html.c:618 ../mail/em-format-html-display.c:939
-msgid "Unsigned"
-msgstr "Usignert"
-
-#: ../mail/em-format-html.c:619 ../mail/em-format-html-display.c:940
-msgid "Valid signature"
-msgstr "Gyldig signatur"
-
-#: ../mail/em-format-html.c:620 ../mail/em-format-html-display.c:941
-msgid "Invalid signature"
-msgstr "Ugyldig signatur"
-
-#: ../mail/em-format-html.c:621
-msgid "Valid signature but cannot verify sender"
-msgstr "Gyldig signatur, men ikke verifisere avsender"
-
-#: ../mail/em-format-html.c:627 ../mail/em-format-html-display.c:948
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
-#: ../mail/em-format-html.c:628 ../mail/em-format-html-display.c:949
-msgid "Encrypted, weak"
-msgstr "Kryptert, svak"
-
-#: ../mail/em-format-html.c:629 ../mail/em-format-html-display.c:950
-msgid "Encrypted"
-msgstr "Kryptert"
-
-#: ../mail/em-format-html.c:630 ../mail/em-format-html-display.c:951
-msgid "Encrypted, strong"
-msgstr "Kryptert, sterk"
-
-#: ../mail/em-format-html.c:894
-msgid "Malformed external-body part."
-msgstr "Feilutformet del for ekstern kropp."
-
-#: ../mail/em-format-html.c:924
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peker til FTP-tjener (%s)"
-
-#: ../mail/em-format-html.c:935
-#, 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:937
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peker til lokal fil (%s)"
-
-#: ../mail/em-format-html.c:958
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Peker til eksterne data (%s)"
-
-#: ../mail/em-format-html.c:969
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peker til ukjente eksterne data («%s»-type)"
-
-#: ../mail/em-format-html.c:1197
-msgid "Formatting message"
-msgstr "Formatterer melding"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1667 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1169
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1694
-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:1697
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:514
 #, c-format
@@ -12002,7 +11677,11 @@ msgstr "_Neste"
 msgid "M_atch case"
 msgstr "Tr_eff på store/små bokstaver"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:618
+msgid "Unsigned"
+msgstr "Usignert"
+
+#: ../mail/em-format-html-display.c:938
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12010,7 +11689,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:619
+msgid "Valid signature"
+msgstr "Gyldig signatur"
+
+#: ../mail/em-format-html-display.c:939
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12018,7 +11701,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:620
+msgid "Invalid signature"
+msgstr "Ugyldig signatur"
+
+#: ../mail/em-format-html-display.c:940
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12026,11 +11713,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:942
+#: ../mail/em-format-html-display.c:941
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:942
+#: ../mail/em-format-html-display.c:941
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12038,7 +11725,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:627
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12046,7 +11737,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:628
+msgid "Encrypted, weak"
+msgstr "Kryptert, svak"
+
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12056,7 +11751,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:629
+msgid "Encrypted"
+msgstr "Kryptert"
+
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12064,7 +11763,11 @@ 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:951
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:630
+msgid "Encrypted, strong"
+msgstr "Kryptert, sterk"
+
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12073,92 +11776,92 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:1052 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1051 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:1067
+#: ../mail/em-format-html-display.c:1066
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:1386
+#: ../mail/em-format-html-display.c:1385
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1393
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: ../mail/em-format-html-display.c:1397
+#: ../mail/em-format-html-display.c:1396
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1456
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1457
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1458
 msgid "_Fit to Width"
 msgstr "_Tilpass bredde"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1459
 msgid "Show _Original Size"
 msgstr "Vis _opprinnelig størrelse"
 
-#: ../mail/em-format-html-display.c:1901 ../mail/em-format-html-display.c:2512
-#: ../mail/mail-config.glade.h:42 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2511
+#: ../mail/mail-config.glade.h:43 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../mail/em-format-html-display.c:2115
+#: ../mail/em-format-html-display.c:2114
 msgid "Save attachment as"
 msgstr "Lagre vedlegg som"
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:2118
 msgid "Select folder to save all attachments"
 msgstr "Velg mappe å lagre alle vedlegg i"
 
-#: ../mail/em-format-html-display.c:2170
+#: ../mail/em-format-html-display.c:2169
 msgid "_Save Selected..."
 msgstr "_Lagre valgte..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2237
+#: ../mail/em-format-html-display.c:2236
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d vedle_gg"
 msgstr[1] "%d vedle_gg"
 
-#: ../mail/em-format-html-display.c:2244 ../mail/em-format-html-display.c:2322
+#: ../mail/em-format-html-display.c:2243 ../mail/em-format-html-display.c:2321
 msgid "S_ave"
 msgstr "L_agre"
 
-#: ../mail/em-format-html-display.c:2255
+#: ../mail/em-format-html-display.c:2254
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../mail/em-format-html-display.c:2318
+#: ../mail/em-format-html-display.c:2317
 msgid "No Attachment"
 msgstr "Ingen vedlegg"
 
-#: ../mail/em-format-html-display.c:2449 ../mail/em-format-html-display.c:2485
+#: ../mail/em-format-html-display.c:2448 ../mail/em-format-html-display.c:2484
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:2451
+#: ../mail/em-format-html-display.c:2450
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:2504
+#: ../mail/em-format-html-display.c:2503
 msgid "O_pen With"
 msgstr "Å_pne med"
 
-#: ../mail/em-format-html-display.c:2573
+#: ../mail/em-format-html-display.c:2574
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -12171,6 +11874,126 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Henter «%s»"
+
+#: ../mail/em-format-html.c:621
+msgid "Valid signature but cannot verify sender"
+msgstr "Gyldig signatur, men ikke verifisere avsender"
+
+#: ../mail/em-format-html.c:892
+msgid "Malformed external-body part."
+msgstr "Feilutformet del for ekstern kropp."
+
+#: ../mail/em-format-html.c:922
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Peker til FTP-tjener (%s)"
+
+#: ../mail/em-format-html.c:933
+#, 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:935
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Peker til lokal fil (%s)"
+
+#: ../mail/em-format-html.c:956
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peker til eksterne data (%s)"
+
+#: ../mail/em-format-html.c:967
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Peker til ukjente eksterne data («%s»-type)"
+
+#: ../mail/em-format-html.c:1194
+msgid "Formatting message"
+msgstr "Formatterer melding"
+
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
+msgid "From"
+msgstr "Fra"
+
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
+msgid "Cc"
+msgstr "Cc"
+
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1177
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1691
+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:1694
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:93
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
+msgid "Date"
+msgstr "Dato"
+
+#: ../mail/em-format-html.c:1727 ../mail/em-format.c:856
+#: ../mail/em-mailer-prefs.c:94
+msgid "Newsgroups"
+msgstr "Nyhetsgrupper"
+
+#: ../mail/em-format.c:1120
+#, c-format
+msgid "%s attachment"
+msgstr "%s-vedlegg"
+
+#: ../mail/em-format.c:1159 ../mail/em-format.c:1310 ../mail/em-format.c:1612
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
+
+#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: ../mail/em-format.c:1300
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
+
+#: ../mail/em-format.c:1467
+msgid "Unsupported signature format"
+msgstr "Ustøttet signaturformat"
+
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+msgid "Error verifying signature"
+msgstr "Feil under verifisering av signatur"
+
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+msgid "Unknown error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
 #: ../mail/em-mailer-prefs.c:105
 msgid "Every time"
 msgstr "Hver gang"
@@ -12187,12 +12010,22 @@ msgstr "En gang i uken"
 msgid "Once per month"
 msgstr "En gang i måneden"
 
+#: ../mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:785
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
 #: ../mail/em-mailer-prefs.c:806
-#, fuzzy
 msgid "No Junk plugin available"
-msgstr "Ingen beskrivelse tilgjengelig."
+msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12204,50 +12037,50 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2709
+#: ../mail/em-migrate.c:2710
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/em-migrate.c:2728
+#: ../mail/em-migrate.c:2729
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12255,16 +12088,16 @@ msgstr ""
 "Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
 "config.xmldb» er korrupt eller ser ikke ut til å eksistere."
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:627
 msgid "_Add to Address Book"
 msgstr "Legg til i _adressebok"
 
@@ -12324,43 +12157,43 @@ msgstr "Søke_mapper"
 msgid "Search Folder source"
 msgstr "Kilde for søke_mappe"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
 msgstr "Lar evolution vise tekstdel av begrenset størrelse"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Automatic smiley recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Composer Window default width"
 msgstr "Forvalgt bredde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12368,90 +12201,92 @@ msgstr ""
 "Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default height of the Composer Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default height of the Message Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default height of the Subscribe dialog"
 msgstr "Forvalgt høyde for dialog for abonnering"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default value for thread expand state"
+msgstr "Forvalgt verdi for trådutvidelsestilstand"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default width of the Composer Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default width of the Message Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default width of the Subscribe dialog"
 msgstr "Forvalgt bredde for abonneringsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Directory for saving mail component files"
 msgstr "Katalog for å lagre komponentfiler for e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Empty Junk folders on exit"
-msgstr "Tøm papirkurven når programmet avsluttes"
+msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Tøm alle papirkurver når programmet avsluttes."
+msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Slå på skrivemerkemodus slik at insettingspunktet vises når du leser e-post."
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12462,23 +12297,23 @@ msgstr ""
 "ved å skrive tekst. Gjør det mulig å finne en mappe i dette feltet ved å "
 "skrive mappenavnet. Fokus vil da flyttes til mappen automatisk."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Enable to render message text part of limited size."
 msgstr "Vis tekstdel av melding med begrenset størrelse."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Height of the message-list pane"
 msgstr "Høyde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12486,7 +12321,7 @@ msgstr ""
 "Spør brukeren om han virkelig vil gjøre det hvis han prøver å åpne 10 eller "
 "flere e-poster på en gang."
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12494,39 +12329,44 @@ msgstr ""
 "Vis forhåndsvisningsområdet ved siden av meldingslisten i stedet for "
 "vertikalt hvis det er aktivt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr "Hvis det ikke finnes et innebygd program v"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid ""
+"It disables the feature where repeated prompts to ask if offline sync is "
+"required."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Aktiver/deaktiver spørring ved merking av flere meldinger."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Last time empty junk was run"
-msgstr "Sist gang papirkurven ble tømt"
+msgstr "Sist gang mapper for uønsket e-post ble tømt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Last time empty trash was run"
 msgstr "Sist gang papirkurven ble tømt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12535,11 +12375,11 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tillpassede topptekster og om de er slått på."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12548,19 +12388,19 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Liste over mime-typer som skal se etter bonobo-komponentvisere"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Load images for HTML messages over http"
 msgstr "Last bilder for HTML-meldinger og http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12570,108 +12410,113 @@ msgstr ""
 "last bilder fra nettet 1 - Last bilder i e-poster fra kontakter 2 - Alltid "
 "last bilder fra nettet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten «Forhåndsvisning»"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Message Window default height"
 msgstr "Forvalgt høyde på meldingsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Message Window default width"
 msgstr "Forvalgt bredde på meldingsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på e-postvisning («normal», «fulle overskrifter», «kilde»)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Minimum days between emptying the junk on exit"
-msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
+msgstr ""
+"Minimum antall dager mellom tømming av mapper for uønsket e-post ved "
+"avslutting"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
-"Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
+"Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
+"avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "New Mail Notify sound file"
 msgstr "Lydfil for varsel om ny e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "New Mail Notify type"
 msgstr "Type varsel for ny e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Stopp og spør før en mappe blir tømt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Stopp og spør når en en e-post uten emne skal bli sendt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Spør når bruker prøver å åpne 10 eller flere meldinger samtidig"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12679,119 +12524,130 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Run junk test on incoming mail"
 msgstr "Sjekk om innkommende e-post er uønsket"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Show photo of the sender"
+msgstr "Vis bilde av avsender"
+
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
 "list"
 msgstr "Vis avsenders e-postadresse i meldingskolonnen i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Vis bilde av avsender i meldingsområdet."
+
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Show the sender email in the messages column in the message list"
 msgstr "Vis avsenders e-postadresse i meldingskolonnen i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Sound file to play when new mail arrives."
 msgstr "Lydfil som skal spilles av når nye meldinger ankommer."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Spesifiserer typen av «Ny e-post advarsel» som ønskes brukt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt høyde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Text message part limit"
 msgstr "Grense for tekstdel av melding"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "The default plugin for Junk hook"
-msgstr ""
+msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr "Sist gang papirkurven ble tømt i dager."
+msgstr "Sist gang mapper for uønsket e-post ble tømt i dager siden epoch."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Sist gang papirkurven ble tømt i dager."
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "The terminal font for mail display"
 msgstr "Terminalskrift for meldingsvisning"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "The variable width font for mail display"
 msgstr "Skrift med variabel bredde for meldingsvisning"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12799,14 +12655,14 @@ msgstr ""
 "Bestemmer maksimal størrelse for tekstdelen som kan formatteres i evolution. "
 "Forvalg er 4MB / 4096 KB og oppgis i KB."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it wont fall back to "
 "the other available plugins."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12818,7 +12674,11 @@ msgstr ""
 "&lt;header enabled&gt; - sett «enabled» hvis toppteksten skal vises i e-"
 "postvisningen. "
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12826,105 +12686,109 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «...»."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Thread the message list."
 msgstr "Bruk meldingsliste med tråder."
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Thread the message-list"
 msgstr "Bruk meldingsliste med tråder"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Thread the message-list based on Subject"
 msgstr "Lag tråder av e-postlisten basert på emne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Timeout for marking message as Seen"
 msgstr "Tidsgrense for å merke e-post som «lest»"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Timeout for marking message as Seen."
 msgstr "Tidsavbrydd å merke e-poster som «Lest»."
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Use SpamAssassin daemon and client"
-msgstr "Bruk Spamassassin tjener og klient"
+msgstr "Bruk SpamAssassin tjener og klient"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Use SpamAssassin daemon and client (spamc/spamd)"
-msgstr "Bruk Spamassassin tjener og klient (spamd/spamc)"
+msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Use custom fonts for displaying mail"
 msgstr "Bruk tilpassede skrifttyper for e-postvisning"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk bare lokale tester for uønsket e-post (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Use side-by-side or wide layout"
 msgstr "Bruk side-ved-side eller bred utforming"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "View/Bcc menu item is checked"
 msgstr "Vis/Bcc menyoppføring er aktivert"
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "View/Bcc menu item is checked."
 msgstr "Vis/Bcc menyoppføring er aktivert."
 
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "View/Cc menu item is checked"
 msgstr "Vis/Cc menyoppføring er aktivert"
 
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "View/Cc menu item is checked."
 msgstr "Vis/Cc menyoppføring er aktivert."
 
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "View/From menu item is checked"
 msgstr "Vis/Fra menyoppføring er aktiver"
 
-#: ../mail/evolution-mail.schemas.in.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "View/From menu item is checked."
 msgstr "Vis/Fra menyoppføring er aktivert."
 
-#: ../mail/evolution-mail.schemas.in.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "View/PostTo menu item is checked"
 msgstr "Vis/SendTil menyoppføring er aktivert"
 
-#: ../mail/evolution-mail.schemas.in.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "View/PostTo menu item is checked."
 msgstr "Vis/SendTil menyoppføring er aktivert."
 
-#: ../mail/evolution-mail.schemas.in.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vis/SvarTil menyoppføring er aktivert"
 
-#: ../mail/evolution-mail.schemas.in.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vis/SvarTil menyoppføring er aktivert."
 
-#: ../mail/evolution-mail.schemas.in.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12932,65 +12796,14 @@ msgstr ""
 "Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Brukervalg for redigering"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigering"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
-msgid "Mail Preferences"
-msgstr "Brukervalg for e-post"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "_E-post"
-
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
@@ -13004,12 +12817,10 @@ msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
@@ -13021,111 +12832,20 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:148
+msgid "Importing mailbox"
+msgstr "Importerer postboks"
+
 #: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
-#: ../mail/importers/mail-importer.c:148
-msgid "Importing mailbox"
-msgstr "Importerer postboks"
-
 #: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: ../mail/importers/netscape-importer.c:74
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Prioritetsfilter: «%s»"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Noen av dine filtre fra Netscape er basert på\n"
-"e-postprioritet, hvilket ikke brukes i Evolution.\n"
-"Evolution gir i stedet poengsummer i området\n"
-"-3 til 3 og disse kan gis til meldinger for å filtrere\n"
-"på dem.\n"
-"\n"
-"For å hjelpe med overgangen er det opprettet et sett med filtre\n"
-"kalt «Prioritetsfiltre», som konverterer e-postprioriteter fra\n"
-"Netscape til poengsummer for bruk med Evolution og filtre som\n"
-"påvirkes av dette endres til å bruke poengsummer i stedet.\n"
-"Sjekk de importerte filtrene for å forsikre deg om at alt\n"
-"fungerer som det skal."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Noen av dine e-postfiltre fra Netscape bruker\n"
-"funksjonen «Ignorer tråd» eller «Overvåk tråd»\n"
-"og denne er ikke støttet i Evolution.\n"
-"Disse filtrene vil utelates."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Noen av dine Netscape e-postfiltre sjekker\n"
-"om meldingskroppen er lik en gitt streng. Dette\n"
-"er ikke støttet i Evolution. Disse filtrene ble\n"
-"endret slik at de sjekker om strengen finnes i\n"
-"meldingskroppen eller ikke."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution importerer dine gamle data fra Netscape"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Importerer data fra Netscape"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "E-post filtre"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution har funnet Netscape e-post filer.\n"
-"Vil du importere dem til Evolution?"
-
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
@@ -13162,87 +12882,87 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:524
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:526
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:871
+#: ../mail/mail-component.c:889
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:872
+#: ../mail/mail-component.c:890
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ../mail/mail-component.c:873
+#: ../mail/mail-component.c:891
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:879
+#: ../mail/mail-component.c:897
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:880
+#: ../mail/mail-component.c:898
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: ../mail/mail-component.c:881
+#: ../mail/mail-component.c:899
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:1027
+#: ../mail/mail-component.c:1045
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
@@ -13279,204 +12999,208 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL er ikke støttet i denne versjonen av Evolution</b>"
 
 #: ../mail/mail-config.glade.h:4
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>Bilde av avsender</b>"
+
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sig_naturer</b> "
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>S_pråk</b> "
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentiseringstyper</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentisering</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Skriving av meldinger</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigurasjon</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Forvalgt oppførsel</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Sletting av e-post</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Meldingshoder som vises</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiketter og farger</span>"
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Lasting av bilder</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Meldingsvisning</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Kvitteringer for meldinger</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Melding om ny e-post</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Tilleggsinformasjon</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativer</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Send krypterte me_ldinger til meg selv også ved sending av kryptert e-post"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Automatically insert _smiley images"
 msgstr "Sett inn _smilefjes automatisk"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:45
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "Check in_coming mail for junk"
 msgstr "Sjekk om inn_kommende e-post er uønsket"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende e-post er uønsket"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Colors"
 msgstr "Farger"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13492,143 +13216,147 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:64
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Delete junk mails on e_xit"
-msgstr ""
+msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Do not format text contents in mails if the text si_ze exceeds"
 msgstr "Ikke formatter tekstinnhold i meldinger hvis _størrelsen overstiger"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
 msgstr "Skrift med fast _bredde:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML-e-post"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inline"
 
 #: ../mail/mail-config.glade.h:93
+msgid "Inline original message (Outlook style)"
+msgstr "Inline opprinnelig melding (Outlook-stil)"
+
+#: ../mail/mail-config.glade.h:95
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:96
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:103
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:104
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spill en l_ydfil når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13636,7 +13364,7 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13644,7 +13372,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13654,115 +13382,127 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:113
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:114
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:115
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:116
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:117
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:118
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:120
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:121
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr "Kun søk etter bilde av avsender i lokale adressebøker"
+
+#: ../mail/mail-config.glade.h:122
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
 msgid "Se_lect..."
 msgstr "Ve_lg..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:127
+msgid "Select Drafts Folder"
+msgstr "Velg mappe for skisser"
+
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
+msgid "Select Sent Folder"
+msgstr "Velg sendt-mappe"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:136
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13770,7 +13510,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13780,7 +13520,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13788,15 +13528,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:154
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13806,92 +13546,96 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:159
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:160
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:161
 msgid "_Default junk plugin:"
-msgstr ""
+msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:162
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:163
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:166
 msgid "_Load images in mail from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:167
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:168
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:170
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:172
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:173
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:174
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:175
 msgid "_Script:"
 msgstr "_Skript:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:178
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:179
+msgid "_Show the photograph of sender in the email preview"
+msgstr "Vi_s bilde av avsender i meldingen"
+
+#: ../mail/mail-config.glade.h:180
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:181
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:182
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:183
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:184
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:185
 msgid "description"
 msgstr "beskrivelse"
 
@@ -13927,7 +13671,7 @@ msgstr "Alle lokale mapper"
 msgid "Case _sensitive"
 msgstr "_Skill mellom små/store bokstaver"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
@@ -13940,7 +13684,6 @@ msgid "Find in Message"
 msgstr "Finn i melding"
 
 #: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -13968,7 +13711,7 @@ msgstr "Sikkerhetsinformasjon"
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13980,11 +13723,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "_Flagg:"
 
@@ -13992,6 +13735,294 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
+#: ../mail/mail-folder-cache.c:875
+#, c-format
+msgid "Pinging %s"
+msgstr "Pinger %s"
+
+#: ../mail/mail-ops.c:105
+msgid "Filtering Selected Messages"
+msgstr "Filtrerer valgte meldinger"
+
+#: ../mail/mail-ops.c:266
+msgid "Fetching Mail"
+msgstr "Henter e-post"
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:566
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Feil under påføring av utgående filtre: %s"
+
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+"Kunne ikke legge til i %s: %s\n"
+"Legger til i lokal «Sendt»-mappe i stedet."
+
+#: ../mail/mail-ops.c:624
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
+
+#: ../mail/mail-ops.c:736
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Sender melding %d av %d"
+
+#: ../mail/mail-ops.c:761
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Feil under sending av %d av %d meldinger"
+
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:689
+msgid "Canceled."
+msgstr "Avbrutt."
+
+#: ../mail/mail-ops.c:765
+msgid "Complete."
+msgstr "Fullført."
+
+#: ../mail/mail-ops.c:862
+msgid "Saving message to folder"
+msgstr "Lagrer melding til mappe"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Moving messages to %s"
+msgstr "Flytter melding(er) til %s"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Copying messages to %s"
+msgstr "Kopierer meldinger til %s"
+
+#: ../mail/mail-ops.c:1170
+msgid "Forwarded messages"
+msgstr "Videresendte meldinger"
+
+#: ../mail/mail-ops.c:1213
+#, c-format
+msgid "Opening folder %s"
+msgstr "Åpner mappe %s"
+
+#: ../mail/mail-ops.c:1285
+#, c-format
+msgid "Opening store %s"
+msgstr "Åpner lager %s"
+
+#: ../mail/mail-ops.c:1363
+#, c-format
+msgid "Removing folder %s"
+msgstr "Fjerner mappe %s"
+
+#: ../mail/mail-ops.c:1457
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Lagrer mappe «%s»"
+
+#: ../mail/mail-ops.c:1522
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Tømmer og lagrer konto «%s»"
+
+#: ../mail/mail-ops.c:1523
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Lagrer konto «%s»"
+
+#: ../mail/mail-ops.c:1578
+msgid "Refreshing folder"
+msgstr "Oppdaterer mappe"
+
+#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+msgid "Expunging folder"
+msgstr "Tømmer mappe"
+
+#: ../mail/mail-ops.c:1662
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Tømmer søppel i «%s»"
+
+#: ../mail/mail-ops.c:1663
+msgid "Local Folders"
+msgstr "Lokale mapper"
+
+#: ../mail/mail-ops.c:1746
+#, c-format
+msgid "Retrieving message %s"
+msgstr "Henter melding %s"
+
+#: ../mail/mail-ops.c:1856
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Henter %d melding"
+msgstr[1] "Henter %d melding(er)"
+
+#: ../mail/mail-ops.c:1942
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Lagrer %d melding"
+msgstr[1] "Lagrer %d melding(er)"
+
+#: ../mail/mail-ops.c:2013
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Feil under lagring av av meldinger til: %s:\n"
+" %s"
+
+#: ../mail/mail-ops.c:2085
+msgid "Saving attachment"
+msgstr "Lagrer vedlegg"
+
+#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Kunne ikke opprette utdatafil: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2114
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Kan ikke skrive data: %s"
+
+#: ../mail/mail-ops.c:2263
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Kobler fra %s"
+
+#: ../mail/mail-ops.c:2263
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "Kobler til %s på nytt"
+
+#: ../mail/mail-ops.c:2361
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Forbereder konto «%s» for frakoblet bruk"
+
+#: ../mail/mail-ops.c:2444
+msgid "Checking Service"
+msgstr "Sjekker tjeneste"
+
+#: ../mail/mail-send-recv.c:161
+msgid "Canceling..."
+msgstr "Avbryter..."
+
+#: ../mail/mail-send-recv.c:386
+msgid "Send & Receive Mail"
+msgstr "Send & motta e-post"
+
+#: ../mail/mail-send-recv.c:393
+msgid "Cancel _All"
+msgstr "Avbryt _alle"
+
+#: ../mail/mail-send-recv.c:501
+msgid "Updating..."
+msgstr "Oppdaterer..."
+
+#: ../mail/mail-send-recv.c:501 ../mail/mail-send-recv.c:570
+msgid "Waiting..."
+msgstr "Venter..."
+
+#: ../mail/mail-send-recv.c:777
+msgid "Checking for new mail"
+msgstr "Ser etter nye meldinger"
+
+#: ../mail/mail-session.c:200
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Skriv inn passord for %s"
+
+#: ../mail/mail-session.c:202
+msgid "Enter Passphrase"
+msgstr "Skriv inn passord"
+
+#: ../mail/mail-session.c:205
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Skriv inn passord for %s"
+
+#: ../mail/mail-session.c:207
+msgid "Enter Password"
+msgstr "Skriv inn passord"
+
+#: ../mail/mail-session.c:245
+msgid "User canceled operation."
+msgstr "Operasjon avbrutt av bruker."
+
+#: ../mail/mail-signature-editor.c:384
+msgid "Edit signature"
+msgstr "Rediger signatur"
+
+#: ../mail/mail-signature-editor.c:431
+msgid "Enter a name for this signature."
+msgstr "Oppgi et navn for denne signaturen."
+
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:4
+msgid "Name:"
+msgstr "Navn:"
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "Kan ikke opprette spool-katalog «%s»: %s"
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Videresendt melding - %s"
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr "Videresendt melding"
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Ugyldig mappe: «%s»"
+
+#: ../mail/mail-vfolder.c:91
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Setter opp søkemappe: %s"
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "Oppdaterer søkemapper for «%s:%s»"
+
+#: ../mail/mail-vfolder.c:247
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr "Oppdaterer søkemapper for «%s»"
+
+#: ../mail/mail-vfolder.c:1023
+msgid "Edit Search Folder"
+msgstr "Rediger søkemappe"
+
+#: ../mail/mail-vfolder.c:1107
+msgid "New Search Folder"
+msgstr "Ny søkemappe"
+
 #: ../mail/mail.error.xml.h:1
 msgid ""
 "A folder named &quot;{0}&quot; already exists. Please use a different name."
@@ -14207,54 +14238,64 @@ msgid "Discard changes?"
 msgstr "Forkast endringer?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Do not d_elete"
+msgstr "Ikke sl_ett"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Do not delete"
 msgstr "Ikke slett"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do not disable"
 msgstr "Ikke deaktiver"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Vil du at operasjonen skal utføres i undermapper?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
+
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Feil under utføring av operasjon."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14262,11 +14303,11 @@ msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14274,11 +14315,11 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14286,19 +14327,19 @@ msgstr ""
 "Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
 "igjen."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14310,39 +14351,39 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mark all messages as read"
 msgstr "Merk alle meldinger som lest"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mark all messages in subfolders as read?"
 msgstr "Merk alle meldinger i undermapper som lest?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid "Mark as _Read"
 msgstr "Me_rk som lest"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14350,7 +14391,7 @@ msgstr ""
 "Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
 "postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14362,50 +14403,58 @@ msgstr ""
 "{0}\n"
 "Send likevel?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 "Det oppsto et problem under migrering av gammel meldingsmappe &quot;{0}"
 "&quot;."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server"
 msgstr "Spør tjener"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Read receipt requested."
 msgstr "Lesekvittering etterspurt."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Vil du virkelig slette mappen &quot;{0}&quot; og alle dens undermapper?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Search Folders automatically updated."
 msgstr "Søkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Send Receipt"
 msgstr "Send kvittering"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:94
+msgid "Synchronize"
+msgstr "Synkroniser"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
+
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14413,7 +14462,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn på, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14429,7 +14478,7 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14443,7 +14492,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "og er nå oppdatert."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14457,11 +14506,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "og er nå oppdatert."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14469,20 +14518,20 @@ msgstr ""
 "Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg "
 "den inn eksplisitt hvis det er nødvendig."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14490,21 +14539,21 @@ msgstr ""
 "Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
 "støtter autentisering i det hele tatt."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:116
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14512,39 +14561,39 @@ msgstr ""
 "Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
 "for skisser i stedet?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:120
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:121
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:122
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:125
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:126
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:127
 msgid "You must name this Search Folder."
 msgstr "Du må gi navn til denne søkemappen."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:128
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14554,313 +14603,34 @@ msgstr ""
 "Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Din pålogging på tjener &quot;{0}&quot; som &quot;{0}&quot; feilet."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:133
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:134
 msgid "_Do not Mark as Read"
 msgstr "Ikke merk s_om lest"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
+msgid "_Do not Synchronize"
+msgstr "I_kke synkroniser"
+
+#: ../mail/mail.error.xml.h:137
 msgid "_Expunge"
 msgstr "T_øm"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:138
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/mail-folder-cache.c:858
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinger %s"
-
-#: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "Filtrerer valgte meldinger"
-
-#: ../mail/mail-ops.c:266
-msgid "Fetching Mail"
-msgstr "Henter e-post"
-
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Feil under påføring av utgående filtre: %s"
-
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-"Kunne ikke legge til i %s: %s\n"
-"Legger til i lokal «Sendt»-mappe i stedet."
-
-#: ../mail/mail-ops.c:624
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
-
-#: ../mail/mail-ops.c:736
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "Sender melding %d av %d"
-
-#: ../mail/mail-ops.c:761
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "Feil under sending av %d av %d meldinger"
-
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:703
-msgid "Canceled."
-msgstr "Avbrutt."
-
-#: ../mail/mail-ops.c:765
-msgid "Complete."
-msgstr "Fullført."
-
-#: ../mail/mail-ops.c:862
-msgid "Saving message to folder"
-msgstr "Lagrer melding til mappe"
-
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Moving messages to %s"
-msgstr "Flytter melding(er) til %s"
-
-#: ../mail/mail-ops.c:947
-#, c-format
-msgid "Copying messages to %s"
-msgstr "Kopierer meldinger til %s"
-
-#: ../mail/mail-ops.c:1170
-msgid "Forwarded messages"
-msgstr "Videresendte meldinger"
-
-#: ../mail/mail-ops.c:1213
-#, c-format
-msgid "Opening folder %s"
-msgstr "Åpner mappe %s"
-
-#: ../mail/mail-ops.c:1285
-#, c-format
-msgid "Opening store %s"
-msgstr "Åpner lager %s"
-
-#: ../mail/mail-ops.c:1363
-#, c-format
-msgid "Removing folder %s"
-msgstr "Fjerner mappe %s"
-
-#: ../mail/mail-ops.c:1457
-#, c-format
-msgid "Storing folder '%s'"
-msgstr "Lagrer mappe «%s»"
-
-#: ../mail/mail-ops.c:1522
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "Tømmer og lagrer konto «%s»"
-
-#: ../mail/mail-ops.c:1523
-#, c-format
-msgid "Storing account '%s'"
-msgstr "Lagrer konto «%s»"
-
-#: ../mail/mail-ops.c:1578
-msgid "Refreshing folder"
-msgstr "Oppdaterer mappe"
-
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
-msgid "Expunging folder"
-msgstr "Tømmer mappe"
-
-#: ../mail/mail-ops.c:1662
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Tømmer søppel i «%s»"
-
-#: ../mail/mail-ops.c:1663
-msgid "Local Folders"
-msgstr "Lokale mapper"
-
-#: ../mail/mail-ops.c:1746
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Henter melding %s"
-
-#: ../mail/mail-ops.c:1856
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Henter %d melding"
-msgstr[1] "Henter %d melding(er)"
-
-#: ../mail/mail-ops.c:1942
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Lagrer %d melding"
-msgstr[1] "Lagrer %d melding(er)"
-
-#: ../mail/mail-ops.c:2013
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Feil under lagring av av meldinger til: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2085
-msgid "Saving attachment"
-msgstr "Lagrer vedlegg"
-
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Kunne ikke opprette utdatafil: %s\n"
-" %s"
-
-#: ../mail/mail-ops.c:2114
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Kan ikke skrive data: %s"
-
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Disconnecting from %s"
-msgstr "Kobler fra %s"
-
-#: ../mail/mail-ops.c:2263
-#, c-format
-msgid "Reconnecting to %s"
-msgstr "Kobler til %s på nytt"
-
-#: ../mail/mail-ops.c:2379
-msgid "Checking Service"
-msgstr "Sjekker tjeneste"
-
-#: ../mail/mail-send-recv.c:161
-msgid "Canceling..."
-msgstr "Avbryter..."
-
-#: ../mail/mail-send-recv.c:403
-msgid "Send & Receive Mail"
-msgstr "Send & motta e-post"
-
-#: ../mail/mail-send-recv.c:410
-msgid "Cancel _All"
-msgstr "Avbryt _alle"
-
-#: ../mail/mail-send-recv.c:516
-msgid "Updating..."
-msgstr "Oppdaterer..."
-
-#: ../mail/mail-send-recv.c:516 ../mail/mail-send-recv.c:583
-msgid "Waiting..."
-msgstr "Venter..."
-
-#: ../mail/mail-send-recv.c:791
-msgid "Checking for new mail"
-msgstr "Ser etter nye meldinger"
-
-#: ../mail/mail-session.c:200
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Skriv inn passord for %s"
-
-#: ../mail/mail-session.c:202
-msgid "Enter Passphrase"
-msgstr "Skriv inn passord"
-
-#: ../mail/mail-session.c:205
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Skriv inn passord for %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Password"
-msgstr "Skriv inn passord"
-
-#: ../mail/mail-session.c:245
-msgid "User canceled operation."
-msgstr "Operasjon avbrutt av bruker."
-
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Rediger signatur"
-
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Oppgi et navn for denne signaturen."
-
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "Navn:"
-
-#: ../mail/mail-tools.c:120
-#, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Kan ikke opprette spool-katalog «%s»: %s"
-
-#: ../mail/mail-tools.c:150
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
-
-#: ../mail/mail-tools.c:256
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "Videresendt melding - %s"
-
-#: ../mail/mail-tools.c:258
-msgid "Forwarded message"
-msgstr "Videresendt melding"
-
-#: ../mail/mail-tools.c:298
-#, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Ugyldig mappe: «%s»"
-
-#: ../mail/mail-vfolder.c:91
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "Setter opp søkemappe: %s"
-
-#: ../mail/mail-vfolder.c:240
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "Oppdaterer søkemapper for «%s:%s»"
-
-#: ../mail/mail-vfolder.c:247
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Oppdaterer søkemapper for «%s»"
-
-#: ../mail/mail-vfolder.c:1023
-msgid "Edit Search Folder"
-msgstr "Rediger søkemappe"
-
-#: ../mail/mail-vfolder.c:1107
-msgid "New Search Folder"
-msgstr "Ny søkemappe"
-
 #: ../mail/message-list.c:1022
 msgid "Unseen"
 msgstr "Ulest"
@@ -14897,38 +14667,38 @@ msgstr "Høyere"
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1469 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476 ../plugins/itip-formatter/itip-view.c:201
+#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:201
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1497 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1507 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2262 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2306 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../mail/message-list.c:3708
+#: ../mail/message-list.c:3752
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -15041,19 +14811,59 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Innebygd programtilleg for lyd"
 
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution archive"
+msgstr "Velg navn på Evolution-arkiv"
+
+#: ../plugins/backup-restore/backup-restore.c:120
+msgid "_Restart Evolution after backup"
+msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
+
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution archive to restore"
+msgstr "Velg Evolution-arkiv som skal gjenopprettes"
+
+#: ../plugins/backup-restore/backup-restore.c:163
+msgid "_Restart Evolution after restore"
+msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
+
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr "Gjenopprett fra sikkerhetskopi"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your archive. It can restore all the Mails/"
+"Calendars/Tasks/Memos/Addressbook. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+"Du kan gjenopprette Evolution fra ditt arkiv. Alle meldinger, kalendere, oppgaver, notater og adressebøker kan gjenopprettes.\n"
+"Du kan også gjenopprette alle dine personlige innstillinger, filtre etc."
+
+#: ../plugins/backup-restore/backup-restore.c:244
+msgid "_Restore Evolution from the backup archive"
+msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+msgid "Choose a file to restore"
+msgstr "Velg en fil som skal gjenopprettes"
+
 #: ../plugins/backup-restore/backup.c:50 ../plugins/backup-restore/backup.c:90
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
 #: ../plugins/backup-restore/backup.c:55
-#, fuzzy
 msgid "Backing Evolution accounts and settings"
-msgstr ""
-"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
+msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
 #: ../plugins/backup-restore/backup.c:60
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
+"Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
 #: ../plugins/backup-restore/backup.c:70
 msgid "Backup complete"
@@ -15065,22 +14875,20 @@ msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
 #: ../plugins/backup-restore/backup.c:94
-#, fuzzy
 msgid "Backup current Evolution data"
-msgstr "Ta sikkerhetskopi av Evolution-mapper"
+msgstr "Ta sikkerhetskopi av data for Evolution"
 
 #: ../plugins/backup-restore/backup.c:99
 msgid "Extracting files from the archive"
-msgstr ""
+msgstr "Henter ut filer fra arkivet"
 
 #: ../plugins/backup-restore/backup.c:105
-#, fuzzy
 msgid "Loading Evolution settings"
-msgstr "Endre innstillinger for Evolution"
+msgstr "Laster innstillinger for Evolution"
 
 #: ../plugins/backup-restore/backup.c:109
 msgid "Removing temporary backup files"
-msgstr ""
+msgstr "Fjerner midlertidige sikkerhetskopier"
 
 #: ../plugins/backup-restore/backup.c:214
 msgid "Backup Evolution directory"
@@ -15121,49 +14929,6 @@ msgstr "Evolution sikkerhetskopiering"
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:96
-msgid "Select name of the Evolution archive"
-msgstr "Velg navn på Evolution-arkiv"
-
-#: ../plugins/backup-restore/backup-restore.c:120
-msgid "_Restart Evolution after backup"
-msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
-
-#: ../plugins/backup-restore/backup-restore.c:139
-#, fuzzy
-msgid "Select name of the Evolution archive to restore"
-msgstr "Velg Evolution-arkiv som skal gjenopprettes"
-
-#: ../plugins/backup-restore/backup-restore.c:163
-msgid "_Restart Evolution after restore"
-msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
-
-#: ../plugins/backup-restore/backup-restore.c:236
-#, fuzzy
-msgid "Restore from backup"
-msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
-
-#: ../plugins/backup-restore/backup-restore.c:238
-msgid ""
-"You can restore Evolution from your archive. It can restore all the Mails/"
-"Calendars/Tasks/Memos/Addressbook. \n"
-"It also restores all your personal settings, mail filters etc."
-msgstr ""
-
-#: ../plugins/backup-restore/backup-restore.c:244
-#, fuzzy
-msgid "_Restore Evolution from the backup archive"
-msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
-
-#: ../plugins/backup-restore/backup-restore.c:251
-#, fuzzy
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Velg Evolution-arkiv som skal gjenopprettes"
-
-#: ../plugins/backup-restore/backup-restore.c:254
-msgid "Choose a file to restore"
-msgstr "Velg en fil som skal gjenopprettes"
-
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15176,14 +14941,12 @@ msgid "Backup and restore plugin"
 msgstr "Tillegg for sikkerhetskopiering og gjenoppretting"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to close Evolution?"
-msgstr "Er du sikker på at du vil slette denne kontoen?"
+msgstr "Er du sikker på at du vil avslutte Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
 msgid "Are you sure you want to restore Evolution from the selected archive?"
-msgstr "Er du sikker på at du vil slette dette møtet?"
+msgstr "Er du sikker på at du vil gjenopprette Evolution fra valgt arkiv?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15194,14 +14957,12 @@ msgid ""
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Invalid Evolution archive"
-msgstr "Sjekk arkiv for Evolution"
+msgstr "Ugyldig arkiv for Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#, fuzzy
 msgid "Please select a valid archive file to restore."
-msgstr "Velg Evolution-arkiv som skal gjenopprettes"
+msgstr "Velg en gyldig arkivfil for gjenoppretting."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -15274,24 +15035,31 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:292
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
 msgid "Convert mail text to _Unicode"
-msgstr ""
+msgstr "Konverter tekst i meldinger til _Unicode"
 
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:1
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
 msgid "Convert mail text to Unicode"
-msgstr ""
+msgstr "Konverter tekst i meldinger til Unicode"
 
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in.h:2
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
 msgstr ""
+"Konverter meldingstekst til Unicode UTF-8 for å gjøre innsamling av "
+"egenskaper for uønskede meldinger mer enhetlig."
 
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
+msgid "_URL:"
+msgstr "_URL:"
+
 #: ../plugins/caldav/caldav-source.c:269
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
@@ -15312,6 +15080,11 @@ msgstr "Lokale kalendere"
 msgid "Provides core functionality for local calendars."
 msgstr "Gir kjernefunksjoner for lokale kalendere."
 
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:546
+msgid "_Refresh:"
+msgstr "_Oppdater:"
+
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
 msgstr "_Sikker tilkobling"
@@ -15357,15 +15130,15 @@ msgstr "Vær: tordenvær"
 msgid "Select a location"
 msgstr "Velg en lokasjon"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "_Enheter:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisk (celcius, cm, osv)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imerisk (Fahrenheit, tommer, osv)"
 
@@ -15389,11 +15162,11 @@ msgstr ""
 msgid "Copy tool"
 msgstr "Kopieringsverktøy"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Undersøk om Evolution er den forvalgte e-postklienten"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -15508,7 +15281,6 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "Håndter innstillinger for delegater for en Exchange konto"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-#, fuzzy
 msgid "Delegation Assistant"
 msgstr "Assistent for delegering"
 
@@ -15603,6 +15375,24 @@ msgstr "Ditt nåværende passord har utløpt. Endre passordet nå."
 msgid "Your password will expire in the next %d days"
 msgstr "Passordet ditt vil utløpe i løpet av de neste %d dagene"
 
+#. Custom
+#: ../plugins/exchange-operations/exchange-delegates-user.c:143
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1556
+msgid "Custom"
+msgstr "Egendefinert"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Rettigheter for delegat"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:201
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#, c-format
+msgid "Permissions for %s"
+msgstr "Rettigheter for %s"
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "Deleger til"
@@ -15657,11 +15447,6 @@ msgstr "K_alender:"
 msgid "Co_ntacts:"
 msgstr "Ko_ntakter: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
-msgid "Delegate Permissions"
-msgstr "Rettigheter for delegat"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "Delegater"
@@ -15700,37 +15485,6 @@ msgstr "_Innboks:"
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:143
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1551
-msgid "Custom"
-msgstr "Egendefinert"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:201
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, c-format
-msgid "Permissions for %s"
-msgstr "Rettigheter for %s"
-
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
-msgid "Unsubscribe Folder..."
-msgstr "Fjern abonnement på mappe..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Fjerne abonnement på mappen «%s»?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Fjern abonnement på «%s»"
-
 #: ../plugins/exchange-operations/exchange-folder-permission.c:61
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
@@ -15753,10 +15507,72 @@ msgstr "Abonner på annen brukers mappe"
 msgid "Exchange Folder Tree"
 msgstr "Tre for Exchange-mappe"
 
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
+msgid "Unsubscribe Folder..."
+msgstr "Fjern abonnement på mappe..."
+
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
+#, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr "Fjerne abonnement på mappen «%s»?"
+
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Fjern abonnement på «%s»"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Du er nå registrert som «Ute av kontoret». </b>\n"
+"\n"
+"Ønsker du å endre status til «Inne»?"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Melding ved fravær:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Status:</b> "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>Meldingen spesifisert under vil sendes automatisk til alle som sender "
+"deg\n"
+"e-post mens du er borte fra kontoret.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Jeg er inne"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Jeg er borte"
+
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Nei, ikke endre status"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Fraværsassistent"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Ja, endre status"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "Varsel om utløp av passord..."
@@ -16255,7 +16071,7 @@ msgstr "Fjern abonnement på mapper"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:428
 msgid "Checklist"
 msgstr "Sjekkliste"
 
@@ -16449,26 +16265,26 @@ msgstr "_Les"
 msgid "_Write"
 msgstr "_Skriv"
 
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr "<b>Kontonavn</b>"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr "Proxy-innlogging"
+
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:262
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#: ../plugins/groupwise-features/proxy.c:697
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
-
-#: ../plugins/groupwise-features/proxy.c:702
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
-
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
-msgid "Proxy"
-msgstr "Proxy"
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
@@ -16476,27 +16292,19 @@ msgstr "Proxy"
 msgid "_Proxy Login..."
 msgstr "_Brukernavn for proxy..."
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Kontonavn</b>"
+#: ../plugins/groupwise-features/proxy.c:697
+msgid "The Proxy tab will be available only when the account is online."
+msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
-msgid "Proxy Login"
-msgstr "Proxy-innlogging"
+#: ../plugins/groupwise-features/proxy.c:702
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
 
-#: ../plugins/groupwise-features/share-folder.c:760
 #: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder.c:760
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/groupwise-features/share-folder.c:765
-msgid "Add   "
-msgstr "Legg til"
-
-#: ../plugins/groupwise-features/share-folder.c:771
-msgid "Modify"
-msgstr "Endre"
-
 #: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
@@ -16509,6 +16317,14 @@ msgstr "Ny _delt mappe..."
 msgid "Sharing"
 msgstr "Deling"
 
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Add   "
+msgstr "Legg til"
+
+#: ../plugins/groupwise-features/share-folder.c:771
+msgid "Modify"
+msgstr "Endre"
+
 #: ../plugins/groupwise-features/status-track.c:103
 msgid "Message Status"
 msgstr "Meldingsstatus"
@@ -16669,7 +16485,6 @@ msgid "Imports ICS attachments to calendar."
 msgstr "Importer ICS-vedlegg til kalenderen."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:62
-#, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
 "\n"
@@ -16698,42 +16513,6 @@ msgstr "Synkroniser til iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronisering"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Ingen mappe for utdata"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"Fant ikke mappe det skal skrives til på iPod! Vennligst sjekk at iPod'en er "
-"korrekt satt opp og prøv igjen."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Kunne ikke eksportere data"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Feil under eksport av data."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Kunne ikke åpne adressebok"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Kunne ikke åpne Evolution adressebok for å eksportere data."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Kunne ikke åpne kalender/oppgaveliste"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "Kunne ikke åpne Evolution kalender/oppgaveliste for å eksportere data."
-
 #: ../plugins/itip-formatter/itip-formatter.c:274
 #: ../plugins/itip-formatter/itip-formatter.c:395
 #, c-format
@@ -17325,6 +17104,112 @@ msgstr "Tillater deaktivering av kontoer."
 msgid "Disable Account"
 msgstr "Deaktiver konto"
 
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Enable libnotify notifications of new mail"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Every time a new mail arrives, pop up a libnotify notification."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Make the status icon blink"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "When the new-mail status icon is visible, make it blink."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:108
+#, c-format
+msgid "You have received %d new message in %s."
+msgstr "Du har mottatt %d ny melding i %s."
+
+#: ../plugins/mail-notification/mail-notification.c:108
+#, c-format
+msgid "You have received %d new messages in %s."
+msgstr "Du har mottatt %d nye meldinger i %s."
+
+#: ../plugins/mail-notification/mail-notification.c:130
+msgid "New email"
+msgstr "Ny e-post"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Varsling om ny e-post"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid ""
+"Notifies the user with tray icon and a notify message whenever a new message "
+"is arrived."
+msgstr ""
+
+#: ../plugins/mail-remote/client.c:30
+#, c-format
+msgid "System error: %s"
+msgstr "Systemfeil: %s"
+
+#: ../plugins/mail-remote/client.c:32
+#, c-format
+msgid "Camel error: %s"
+msgstr "Feil i Camel: %s"
+
+#: ../plugins/mail-remote/evolution-mail-store.c:476
+msgid "Account cannot send e-mail"
+msgstr "Konto kan ikke sende e-post"
+
+#: ../plugins/mail-remote/evolution-mail-store.c:605
+msgid "No store available"
+msgstr "Ingen lager tilgjengelig"
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr ""
+"Et programtilleg som legger til et CORBA-grensesnitt for tilgang på e-"
+"postdata eksternt."
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+msgid "Mail Remote"
+msgstr "Ekstern tilgang til e-post"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+"Et programtilleg som gjør det mulig å opprette møter fra innholdet til en e-"
+"post."
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "Kon_verter til møte"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "E-post til møte"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+"Et programtillegg som gjør det mulig å opprette en oppgave fra innholdet til "
+"en e-post."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr "Kon_verter til oppgave"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "E-post til oppgave"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Konverter valgt melding til en ny oppgave"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
 msgstr "Eier av k_ontaktliste"
@@ -17490,72 +17375,6 @@ msgstr "_Abonner på listen"
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mail-remote/client.c:30
-#, c-format
-msgid "System error: %s"
-msgstr "Systemfeil: %s"
-
-#: ../plugins/mail-remote/client.c:32
-#, c-format
-msgid "Camel error: %s"
-msgstr "Feil i Camel: %s"
-
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Konto kan ikke sende e-post"
-
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "Ingen lager tilgjengelig"
-
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr ""
-"Et programtilleg som legger til et CORBA-grensesnitt for tilgang på e-"
-"postdata eksternt."
-
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "Ekstern tilgang til e-post"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
-"Et programtilleg som gjør det mulig å opprette møter fra innholdet til en e-"
-"post."
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Kon_verter til møte"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "E-post til møte"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr ""
-"Et programtillegg som gjør det mulig å opprette en oppgave fra innholdet til "
-"en e-post."
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Kon_verter til oppgave"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "E-post til oppgave"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Konverter valgt melding til en ny oppgave"
-
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Merk alle som lest"
@@ -17600,10 +17419,6 @@ msgstr "Genererer en D-BUS-melding når nye meldinger ankommer."
 msgid "New Mail Notification"
 msgstr "Varsling for ny e-post"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Varsle ny e-post"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr ""
@@ -17612,7 +17427,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:202
 msgid "Plugin Manager"
 msgstr "Tilleggshåndterer"
 
@@ -17624,23 +17439,23 @@ msgstr "Aktiver og deaktiver tillegg"
 msgid "_Plugins"
 msgstr "_Tillegg"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:53
 msgid "Author(s)"
 msgstr "Fofatter(e)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../widgets/table/e-table-config.glade.h:5
+#: ../plugins/plugin-manager/plugin-manager.c:54
 #: ../widgets/table/e-table-config-no-group.glade.h:6
+#: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:215
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Merk: Noen endringer vil ikke tre i kraft før programmet startes på nytt"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:268
+#: ../plugins/plugin-manager/plugin-manager.c:327
 msgid "Plugin"
 msgstr "Tillegg"
 
@@ -17784,10 +17599,22 @@ msgstr "_Type tjeneste:"
 msgid "_File:"
 msgstr "_Fil:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Passord:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "_Publiser som:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "Hu_sk passord"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "Br_ukernavn:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17796,32 +17623,27 @@ msgstr ""
 "iCal\n"
 "Ledig/opptatt"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (innebygget)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:841
-#, fuzzy
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
 msgid "This will make Spamassasin more reliable, but slower"
-msgstr "<small>Dette vil gjøre filteret mer pålitelig, men tregere</small>"
+msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:847
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
-msgstr ""
-"Filtrerer uønskede meldinger med Spamassassin. Dette tillegget krever at "
-"Spamassassin er installert."
+msgstr "Filtrerer uønskede meldinger med SpamAssassin. Dette tillegget krever at Spamassassin er installert."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "SpamAssassin junk plugin"
-msgstr "Spamassassin tillegg for uønsket e-post"
+msgstr "SpamAssassin-tillegg for uønsket e-post"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17851,7 +17673,7 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "Lagre"
 
@@ -18030,6 +17852,11 @@ msgstr "Fra %s:"
 msgid "Importing data."
 msgstr "Importerer data."
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "Vennligst vent"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "Indikerer om tråding av meldinger skal falle tilbake til emne."
@@ -18047,62 +17874,78 @@ msgstr "Vis meldingstråder etter emne"
 msgid "Fall back to threading messages by sub_ject"
 msgstr "Fall tilbake til tråding av meldinger etter e_mne"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skall"
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Konfigurasjonsfabrikk for 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.h:1
 msgid "A string description of the current printer settings"
 msgstr "Beskrivelse av de aktive skriverinstillingene"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "Konfigurasjonsversjon"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Default sidebar width"
 msgstr "Forvalgt bredde på sidelinje"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default window height"
 msgstr "Forvalgt vinduhøyde"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window state"
 msgstr "Forvalgt vindutilstand"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window width"
 msgstr "Forvalgt vindubredde"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgradert konfigurasjonsversjon"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stier for mapper som skal bli synkronisert til disk for frakoblet "
 "bruk"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Sidebar is visible"
 msgstr "Sidelinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:457
+#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "Statusbar is visible"
 msgstr "Statuslinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18110,19 +17953,19 @@ msgstr ""
 "Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå "
 "(for eksempel «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Forvalgt høyde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Forvalgt bredde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Forvalgt bredde på sidelinjen i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18130,7 +17973,7 @@ msgstr ""
 "Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/"
 "konfigurasjonsnivå (for eksempel «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18140,46 +17983,46 @@ msgstr ""
 "Hvis «toolbar» er satt vil stilen på knappene bli bestemt av GNOME «toolbar»-"
 "instillingene."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Om Evolution skal startes i frakoblet modus i stedet for tilkoblet modus."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Om vinduet skal være maksimert."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidelinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Om advarselsdialogen i utviklingsversjoner av Evolution blir hoppet over."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the window buttons should be visible."
 msgstr "Om vinduknappene skal være synlige."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Window button style"
 msgstr "Knappestil for vindu"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
@@ -18195,31 +18038,6 @@ msgstr "Aktive tilkoblinger"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
-#: ../shell/e-shell.c:636
-msgid "Uknown system error."
-msgstr "Ukjent systemfeil."
-
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell.c:1264 ../widgets/misc/e-cell-date-edit.c:255
-msgid "OK"
-msgstr "OK"
-
-#: ../shell/e-shell.c:1266
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: ../shell/e-shell.c:1268
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: ../shell/e-shell.c:1270
-msgid "Configuration Database not found"
-msgstr "Konfigurasjonsdatabase ikke funnet"
-
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
@@ -18303,25 +18121,6 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: ../shell/e-shell-window.c:381
-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:389
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution er i ferd med å koble fra."
-
-#: ../shell/e-shell-window.c:396
-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:820
-#, c-format
-msgid "Switch to %s"
-msgstr "Bytt til %s"
-
 #: ../shell/e-shell-window-commands.c:76
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -18363,6 +18162,50 @@ msgstr "Ar_beid frakoblet"
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
+#: ../shell/e-shell-window.c:381
+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:389
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution er i ferd med å koble fra."
+
+#: ../shell/e-shell-window.c:396
+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:820
+#, c-format
+msgid "Switch to %s"
+msgstr "Bytt til %s"
+
+#: ../shell/e-shell.c:636
+msgid "Uknown system error."
+msgstr "Ukjent systemfeil."
+
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell.c:1264 ../widgets/misc/e-cell-date-edit.c:255
+msgid "OK"
+msgstr "OK"
+
+#: ../shell/e-shell.c:1266
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: ../shell/e-shell.c:1268
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: ../shell/e-shell.c:1270
+msgid "Configuration Database not found"
+msgstr "Konfigurasjonsdatabase ikke funnet"
+
 #: ../shell/e-user-creatable-items-handler.c:678
 #: ../shell/e-user-creatable-items-handler.c:688
 #: ../shell/e-user-creatable-items-handler.c:693
@@ -18381,22 +18224,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_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Konfigurasjonsfabrikk for 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/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."
@@ -18436,7 +18263,7 @@ msgstr ""
 "eksterne filer til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:218
+#: ../shell/main.c:219
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18471,7 +18298,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:242
+#: ../shell/main.c:243
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18479,39 +18306,39 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:249
+#: ../shell/main.c:250
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:455
+#: ../shell/main.c:456
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:459
+#: ../shell/main.c:460
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:462
+#: ../shell/main.c:463
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:467
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:470
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:500
+#: ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:511
+#: ../shell/main.c:512
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18666,6 +18493,26 @@ msgstr ""
 "\n"
 "Rediger innstillinger for tillit:"
 
+#: ../smime/gui/cert-trust-dialog.c:154
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Fordi du stoler på sertifikatmyndigheten som utstedte dette sertifikatet "
+"stoler du også på at dette sertifikatet er autentisk med mindre annet "
+"indikeres her"
+
+#: ../smime/gui/cert-trust-dialog.c:158
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Fordi du ikke stoler på sertifikatmyndigheten som utstedte dette "
+"sertifikatet stoler du heller ikke på at dette sertifikatet er autentisk med "
+"mindre annet indikeres her"
+
 #: ../smime/gui/certificate-manager.c:138
 #: ../smime/gui/certificate-manager.c:156
 #: ../smime/gui/certificate-manager.c:389
@@ -18706,44 +18553,22 @@ msgid "Expires"
 msgstr "Utgår"
 
 #: ../smime/gui/certificate-manager.c:398
-#, fuzzy
 msgid "All email certificate files"
-msgstr "Sertifikatmyndighet for e-post"
+msgstr "Alle sertifikatfiler for e-post"
 
 #: ../smime/gui/certificate-manager.c:505
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
 #: ../smime/gui/certificate-manager.c:630
-#, fuzzy
 msgid "All CA certificate files"
-msgstr "Detaljer om sertifikat"
+msgstr "Alle CA-sertifikatfiler"
 
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
-#: ../smime/gui/cert-trust-dialog.c:154
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Fordi du stoler på sertifikatmyndigheten som utstedte dette sertifikatet "
-"stoler du også på at dette sertifikatet er autentisk med mindre annet "
-"indikeres her"
-
-#: ../smime/gui/cert-trust-dialog.c:158
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Fordi du ikke stoler på sertifikatmyndigheten som utstedte dette "
-"sertifikatet stoler du heller ikke på at dette sertifikatet er autentisk med "
-"mindre annet indikeres her"
-
 #: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
@@ -18963,6 +18788,11 @@ msgstr "Dine sertifikater"
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: ../smime/lib/e-cert-db.c:676
+msgid "Certificate already exists"
+msgstr "Sertifikatet eksisterer allerede"
+
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -19126,11 +18956,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:676
-msgid "Certificate already exists"
-msgstr "Sertifikatet eksisterer allerede"
-
 #: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
@@ -19143,30 +18968,6 @@ msgstr "Oppgi passord for PKCS12-fil:"
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "Et vedlegg som skal legges til."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Innholdstype for vedlegget."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "Filnavnet som skal vises i meldingen."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Beskrivelse av vedlegget."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Merk vedlegg for visning i meldingen som forvalg."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Forvalgt emne for meldingen."
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -19298,7 +19099,7 @@ msgstr "Lagre valgte kontakter som et VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Lagre kontakter i valgt mappe som VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2713
 msgid "Select All"
 msgstr "Velg alle"
 
@@ -19575,17 +19376,17 @@ msgstr "Lukk"
 msgid "I_nsert"
 msgstr "Sett i_nn"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
 msgid "_File"
@@ -19648,87 +19449,91 @@ msgid "R_ole Field"
 msgstr "R_olle-felt"
 
 #: ../ui/evolution-event-editor.xml.h:16
+msgid "Send _Options"
+msgstr "Alter_nativer for sending"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Slår av/på visning av deltaker-feltet"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "Slår av/på hendelser som varer hele dagen"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "Slår av/på visning av tid som opptatt"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "V_arsel"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "_Ledig/opptatt"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "Gjeninnt_reffelse"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "_Type felt"
 
@@ -19753,79 +19558,91 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages for Offline"
+msgstr "Last ned meldinger for frakoblet bruk"
+
+#: ../ui/evolution-mail-global.xml.h:8
+msgid "Download messages for offline"
+msgstr "Last ned meldinger for frakoblet bruk"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Show message preview side-by-side with the message list"
 msgstr "Vis forhåndsvisning av meldinger side-om-side med meldingslisten"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "Show message preview window"
 msgstr "Vis vindu for forhåndsvisning av melding"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:24
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:30
 msgid "_Subscriptions"
 msgstr "_Abonnement"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:31
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -19900,63 +19717,62 @@ msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
 #: ../ui/evolution-mail-list.xml.h:20
+msgid "Re_fresh..."
+msgstr "O_ppdater..."
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Refresh the folder"
+msgstr "Oppdater mappen"
+
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select _All Messages"
 msgstr "Velg _alle meldinger"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Velg alle og bare meldinger som ikke allerede er valgt"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Show Hidde_n Messages"
 msgstr "Vis skjulte meldi_nger"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Show messages that have been temporarily hidden"
 msgstr "Vis meldinger som er midlertidig skjult"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Skjul alle leste meldinger midlertidig"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Temporarily hide the selected messages"
 msgstr "Skjul valgte meldinger midlertidig"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../ui/evolution-mail-list.xml.h:32
+#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
-msgid "Main toolbar"
-msgstr "Hovedverktøylinje"
-
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
@@ -20255,8 +20071,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "Søkemappe på e-post_liste..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "Søkemappe for mottakere..."
+msgid "Search Folder from Recipien_ts..."
+msgstr "Søkemappe fra mo_ttakere..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -20402,6 +20218,14 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+msgid "Main toolbar"
+msgstr "Hovedverktøylinje"
+
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
 msgstr "Kopier valgt notat"
@@ -20490,144 +20314,164 @@ msgid "PGP Sign"
 msgstr "Signer med PGP"
 
 #: ../ui/evolution-message-composer.xml.h:17
+msgid "PGP _Encrypt"
+msgstr "Krypt_er med PGP"
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "PGP _Sign"
+msgstr "_Signer med PGP"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "Spør om l_esekvittering"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "S/MIME En_crypt"
+msgstr "_Krypter med S/MIME"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "Krypter med S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "S/MIME Sig_n"
+msgstr "Sig_ner med S/MIME"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "S_end"
+msgstr "S_end"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "L_agre utkast"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "Send"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Slå av/på visning av Post-til feltet"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "_Slett alle"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "_Til-felt"
 
@@ -20927,6 +20771,82 @@ msgstr "Kun _tekst"
 msgid "_Window"
 msgstr "_Vindu"
 
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Etter _firma"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "_Adressekort"
+
+#: ../views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr "Tele_fonliste"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "Uk_evisning"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "_Dagvisning"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "_Listevisning"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Månedsvisning"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "Ar_beidsukevisning"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "Som sendt-mappe for _vertikal visning"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "Som _Sendt-mappe"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "Etter s_tatus"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "Etter avse_nder"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "Etter _emne"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "Etter opp_følgingsflagg"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "For _vertikal visning"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_Meldinger"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Notater"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "Med fer_dig-dato"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "Med _status"
+
 #. Put the ""UTC" entry at the top of the combo's list.
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
@@ -20988,27 +20908,12 @@ msgid "_Edit..."
 msgstr "_Rediger..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1904
+#: ../widgets/table/e-table-header-item.c:1909
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "Tabell"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Egendefinert visning"
-
-#: ../widgets/menus/gal-view-instance.c:588
-msgid "Save Custom View"
-msgstr "Lagre egendefinert visning"
-
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Definer visninger..."
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
 msgid "Instance"
 msgstr "Instans"
@@ -21025,14 +20930,46 @@ msgstr "_Opprett en ny visning"
 msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:354
+msgid "Custom View"
+msgstr "Egendefinert visning"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "Lagre egendefinert visning"
+
+#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-menus.c:378
+msgid "Define Views..."
+msgstr "Definer visninger..."
+
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "Velg visning: %s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "Aktiv visning er en egendefinert visning"
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "Lagre aktiv egendefinert visning"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "Opprett eller rediger visninger"
+
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
 msgstr "Factory"
@@ -21053,14 +20990,37 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
+#: ../widgets/misc/e-attachment-bar.c:1019
+msgid "Attachment Bar"
+msgstr "Vedleggsfelt"
+
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Kan ikke legge ved fil: %s: %s"
+
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Egenskaper for vedlegg"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Filnavn:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME-type:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: ../widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Månedskalender"
-
 #. 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:416
@@ -21073,10 +21033,14 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Månedskalender"
+
 #: ../widgets/misc/e-canvas-background.c:457
 #: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3579
-#: ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Fyllfarge"
 
@@ -21085,16 +21049,16 @@ msgstr "Fyllfarge"
 #: ../widgets/misc/e-canvas-background.c:471
 #: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1242
 #: ../widgets/text/e-entry.c:1243 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3586
-#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3594
-#: ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Fyllfarge for GDK"
 
 #: ../widgets/misc/e-canvas-background.c:478
 #: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3601
-#: ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Fyll stiplet"
 
@@ -21150,99 +21114,107 @@ msgstr "Datoen må skrives inn på formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "Sentral-europeisk"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "Vest-europeisk"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "Vest-europeisk, ny"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
 #: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "Synlig"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../widgets/misc/e-clipped-label.c:111
+#. Translators: This is the string to draw when the label
+#. * of a fixed-size button is clipped, e.g. '...'.
+#.
+#: ../widgets/misc/e-clipped-label.c:114
 msgid "..."
 msgstr "..."
 
@@ -21274,11 +21246,11 @@ msgstr "N_å"
 msgid "_Today"
 msgstr "I _dag"
 
-#: ../widgets/misc/e-dateedit.c:1630
+#: ../widgets/misc/e-dateedit.c:1631
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1656
+#: ../widgets/misc/e-dateedit.c:1657
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
@@ -21318,11 +21290,11 @@ msgstr "Etikettkomponent"
 msgid "A widget to display in place of the usual expander label"
 msgstr "En komponent som vises i stedet for den vanlige utvideretiketten"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3316
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3351
 msgid "Expander Size"
 msgstr "Størrelse på utvider"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3317
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3352
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpilen"
 
@@ -21336,7 +21308,7 @@ msgstr "Mellomrom rundt utviderpilen"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:292 ../widgets/misc/e-filter-bar.c:728
+#: ../widgets/misc/e-filter-bar.c:292 ../widgets/misc/e-filter-bar.c:729
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -21385,11 +21357,11 @@ msgstr "Denne meldingen"
 msgid "Choose Image"
 msgstr "Velg et bilde"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: ../widgets/misc/e-map.c:630
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -21438,8 +21410,8 @@ msgid "Item ID"
 msgstr "ID for oppføring"
 
 #: ../widgets/misc/e-search-bar.c:863 ../widgets/text/e-entry.c:1221
-#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3501
-#: ../widgets/text/e-text.c:3502
+#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Tekst"
 
@@ -21688,127 +21660,115 @@ msgstr "Farget kolonne"
 msgid "BG Color Column"
 msgstr "Kolonne for bakgrunnsfarge"
 
-#: ../widgets/table/e-table.c:3310
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-tree.c:3263 ../widgets/table/e-tree.c:3264
-msgid "Length Threshold"
-msgstr "Lengdeterskel"
-
-#: ../widgets/table/e-table.c:3317
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-tree.c:3295 ../widgets/table/e-tree.c:3296
-msgid "Uniform row height"
-msgstr "Enhetlig høyde på rad"
-
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3302
-#: ../widgets/table/e-tree.c:3303
-msgid "Always search"
-msgstr "Alltid søk"
-
-#: ../widgets/table/e-table.c:3331
-msgid "Use click to add"
-msgstr "Bruk klikk for å legge til"
-
-#: ../widgets/table/e-table-config.c:149
-msgid "State"
-msgstr "Tilstand"
-
-#: ../widgets/table/e-table-config.c:306 ../widgets/table/e-table-config.c:348
-msgid "(Ascending)"
-msgstr "(Stigende)"
-
-#: ../widgets/table/e-table-config.c:306 ../widgets/table/e-table-config.c:348
-msgid "(Descending)"
-msgstr "(Synkende)"
-
-#: ../widgets/table/e-table-config.c:313
-msgid "Not sorted"
-msgstr "Ikke sortert"
-
-#: ../widgets/table/e-table-config.c:354
-msgid "No grouping"
-msgstr "Ingen gruppering"
-
-#: ../widgets/table/e-table-config.c:562
-#: ../widgets/table/e-table-config.glade.h:10
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-msgid "Show Fields"
-msgstr "Vis felter"
-
-#: ../widgets/table/e-table-config.c:583
-msgid "Available Fields"
-msgstr "Tilgjengelige felt"
+#: ../widgets/table/e-table-config-no-group.glade.h:1
+msgid "<- _Remove"
+msgstr "<-_Fjern"
 
-#: ../widgets/table/e-table-config.glade.h:1
 #: ../widgets/table/e-table-config-no-group.glade.h:2
+#: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
-#: ../widgets/table/e-table-config.glade.h:2
 #: ../widgets/table/e-table-config-no-group.glade.h:3
-#: ../widgets/table/e-table-header-item.c:1572
+#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../widgets/table/e-table-config.glade.h:3
 #: ../widgets/table/e-table-config-no-group.glade.h:4
+#: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "Fjern alt"
 
-#: ../widgets/table/e-table-config.glade.h:4
 #: ../widgets/table/e-table-config-no-group.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1572
+#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Descending"
 msgstr "Synkende"
 
-#: ../widgets/table/e-table-config.glade.h:7
 #: ../widgets/table/e-table-config-no-group.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:7
 msgid "Group Items By"
 msgstr "Grupper elementer etter"
 
-#: ../widgets/table/e-table-config.glade.h:8
 #: ../widgets/table/e-table-config-no-group.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
 msgstr "Flytt _ned"
 
-#: ../widgets/table/e-table-config.glade.h:9
 #: ../widgets/table/e-table-config-no-group.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Up"
 msgstr "Flytt _opp"
 
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr "V_is disse feltene i rekkefølge:"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Show Fields"
+msgstr "Vis felter"
+
 #: ../widgets/table/e-table-config-no-group.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:11
 msgid "Show field in View"
 msgstr "Vis felt i visning"
 
-#: ../widgets/table/e-table-config.glade.h:12
 #: ../widgets/table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:12
 msgid "Sort"
 msgstr "Sorter"
 
-#: ../widgets/table/e-table-config.glade.h:13
 #: ../widgets/table/e-table-config-no-group.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:13
 msgid "Sort Items By"
 msgstr "Sorter elementer etter"
 
-#: ../widgets/table/e-table-config.glade.h:14
 #: ../widgets/table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:14
 msgid "Then By"
 msgstr "Så etter"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config-no-group.glade.h:17
+msgid "_Add ->"
+msgstr "_Legg til ->"
+
 #: ../widgets/table/e-table-config-no-group.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
 msgstr "_Viste felt..."
 
+#: ../widgets/table/e-table-config-no-group.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Sort..."
+msgstr "_Sorter..."
+
+#: ../widgets/table/e-table-config.c:154
+msgid "State"
+msgstr "Tilstand"
+
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+msgid "(Ascending)"
+msgstr "(Stigende)"
+
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+msgid "(Descending)"
+msgstr "(Synkende)"
+
+#: ../widgets/table/e-table-config.c:394
+msgid "Not sorted"
+msgstr "Ikke sortert"
+
+#: ../widgets/table/e-table-config.c:435
+msgid "No grouping"
+msgstr "Ingen gruppering"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "Tilgjengelige felt"
+
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "_Grupper etter..."
@@ -21817,34 +21777,17 @@ msgstr "_Grupper etter..."
 msgid "_Show these fields in order:"
 msgstr "_Vis disse feltene i rekkefølge:"
 
-#: ../widgets/table/e-table-config.glade.h:20
-#: ../widgets/table/e-table-config-no-group.glade.h:19
-msgid "_Sort..."
-msgstr "_Sorter..."
-
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<-_Fjern"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "V_is disse feltene i rekkefølge:"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "_Legg til ->"
-
-#: ../widgets/table/e-table-field-chooser.c:77
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-header-item.c:1869
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1874
 msgid "DnD code"
 msgstr "DnD-kode"
 
-#: ../widgets/table/e-table-field-chooser.c:84
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-header-item.c:1883
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1888
 msgid "Full Header"
 msgstr "Full header"
 
@@ -21891,7 +21834,7 @@ msgstr "Skiftende farger på rader"
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3269 ../widgets/table/e-tree.c:3270
+#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
 msgid "Horizontal Draw Grid"
 msgstr "Horisontalt rutenett for tegning"
 
@@ -21900,7 +21843,7 @@ msgstr "Horisontalt rutenett for tegning"
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3275 ../widgets/table/e-tree.c:3276
+#: ../widgets/table/e-tree.c:3310 ../widgets/table/e-tree.c:3311
 msgid "Vertical Draw Grid"
 msgstr "Vertikalt rutenett for tegning"
 
@@ -21909,7 +21852,7 @@ msgstr "Vertikalt rutenett for tegning"
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3281 ../widgets/table/e-tree.c:3282
+#: ../widgets/table/e-tree.c:3316 ../widgets/table/e-tree.c:3317
 msgid "Draw focus"
 msgstr "Tegn fokus"
 
@@ -21929,6 +21872,26 @@ msgstr "Markørmodus"
 msgid "Selection model"
 msgstr "Utvalgsmodell"
 
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table.c:3310 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
+msgid "Length Threshold"
+msgstr "Lengdeterskel"
+
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
+#: ../widgets/table/e-table.c:3317 ../widgets/table/e-tree.c:3330
+#: ../widgets/table/e-tree.c:3331
+msgid "Uniform row height"
+msgstr "Enhetlig høyde på rad"
+
 #: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
@@ -21936,68 +21899,68 @@ msgstr "Utvalgsmodell"
 msgid "Frozen"
 msgstr "Frosset"
 
-#: ../widgets/table/e-table-header-item.c:1450
+#: ../widgets/table/e-table-header-item.c:1454
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1470
-msgid "Sort Ascending"
-msgstr "Sorter stigende"
-
-#: ../widgets/table/e-table-header-item.c:1471
-msgid "Sort Descending"
-msgstr "Sorter synkende"
-
-#: ../widgets/table/e-table-header-item.c:1472
-msgid "Unsort"
-msgstr "Ikke sorter"
-
 #: ../widgets/table/e-table-header-item.c:1474
-msgid "Group By This Field"
-msgstr "Grupper etter dette feltet"
+msgid "Sort _Ascending"
+msgstr "Sorter s_tigende"
 
 #: ../widgets/table/e-table-header-item.c:1475
-msgid "Group By Box"
-msgstr "Grupper etter boks"
+msgid "Sort _Descending"
+msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1477
-msgid "Remove This Column"
-msgstr "Fjern denne kolonnen"
+#: ../widgets/table/e-table-header-item.c:1476
+msgid "_Unsort"
+msgstr "_Fjern sortering"
 
 #: ../widgets/table/e-table-header-item.c:1478
-msgid "Add a Column..."
-msgstr "Legg til en kolonne..."
+msgid "Group By This _Field"
+msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1480
-msgid "Alignment"
-msgstr "Justering"
+#: ../widgets/table/e-table-header-item.c:1479
+msgid "Group By _Box"
+msgstr "Grupper etter _boks"
 
 #: ../widgets/table/e-table-header-item.c:1481
-msgid "Best Fit"
-msgstr "Beste tilpasning"
+msgid "Remove This _Column"
+msgstr "Fjern denne _kolonnen"
 
 #: ../widgets/table/e-table-header-item.c:1482
-msgid "Format Columns..."
-msgstr "Formater kolonner..."
+msgid "Add a C_olumn..."
+msgstr "Legg til en k_olonne..."
 
 #: ../widgets/table/e-table-header-item.c:1484
-msgid "Customize Current View..."
-msgstr "Tilpass aktiv visning..."
+msgid "A_lignment"
+msgstr "_Justering"
+
+#: ../widgets/table/e-table-header-item.c:1485
+msgid "B_est Fit"
+msgstr "B_este tilpasning"
+
+#: ../widgets/table/e-table-header-item.c:1486
+msgid "Format Column_s..."
+msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1533
+#: ../widgets/table/e-table-header-item.c:1488
+msgid "Custo_mize Current View..."
+msgstr "T_ilpass aktiv visning..."
+
+#: ../widgets/table/e-table-header-item.c:1538
 msgid "Sort By"
 msgstr "Sorter etter"
 
-#: ../widgets/table/e-table-header-item.c:1876
+#: ../widgets/table/e-table-header-item.c:1881
 msgid "Font Description"
 msgstr "Beskrivelse av skrift"
 
-#: ../widgets/table/e-table-header-item.c:1897
+#: ../widgets/table/e-table-header-item.c:1902
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sorteringsinformasjon"
 
-#: ../widgets/table/e-table-header-item.c:1911
+#: ../widgets/table/e-table-header-item.c:1916
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -22015,75 +21978,84 @@ msgstr "Modell for tabell"
 msgid "Cursor row"
 msgstr "Pekerrad"
 
-#: ../widgets/table/e-tree.c:3288 ../widgets/table/e-tree.c:3289
+#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
+msgid "Always search"
+msgstr "Alltid søk"
+
+#: ../widgets/table/e-table.c:3331
+msgid "Use click to add"
+msgstr "Bruk klikk for å legge til"
+
+#: ../widgets/table/e-tree.c:3323 ../widgets/table/e-tree.c:3324
 msgid "ETree table adapter"
 msgstr "ETree tabelladapter"
 
-#: ../widgets/table/e-tree.c:3309
+#: ../widgets/table/e-tree.c:3344
 msgid "Retro Look"
 msgstr "Gammeldags utseende"
 
-#: ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-tree.c:3345
 msgid "Draw lines and +/- expanders."
 msgstr "Tegn linjer og +/- utvidere."
 
 #: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
-#: ../widgets/text/e-text.c:3494 ../widgets/text/e-text.c:3495
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Hendelsesprosessor"
 
 #: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
-#: ../widgets/text/e-text.c:3530 ../widgets/text/e-text.c:3531
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Justering"
 
 #: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Bruk ellipse"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Ellipse"
 
 #: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3644 ../widgets/text/e-text.c:3645
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Linjebryting"
 
 #: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3652
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Brytingstegn"
 
 #: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3658 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Maks antall linjer"
 
 #: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3687 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Tillat linjeskift"
 
 #: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Tegn kanter"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Tegn bakgrunn"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Tegn knapp"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Markørposisjon"
 
@@ -22091,146 +22063,323 @@ msgstr "Markørposisjon"
 msgid "Emulate label resize"
 msgstr "Emuler endring av størrelse på etikett"
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Minikort test"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Opphavsrett (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "Testprogram for minicard canvas-oppføring"
-
-#: ../widgets/text/e-text.c:2737
+#: ../widgets/text/e-text.c:2725
 msgid "Input Methods"
 msgstr "Inndatametoder"
 
-#: ../widgets/text/e-text.c:3508 ../widgets/text/e-text.c:3509
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Fet"
 
-#: ../widgets/text/e-text.c:3515 ../widgets/text/e-text.c:3516
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Uthevet"
 
-#: ../widgets/text/e-text.c:3522 ../widgets/text/e-text.c:3523
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../widgets/text/e-text.c:3537 ../widgets/text/e-text.c:3538
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Bredde på utklipp"
 
-#: ../widgets/text/e-text.c:3544 ../widgets/text/e-text.c:3545
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Høyde på utklipp"
 
-#: ../widgets/text/e-text.c:3551 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Utklipp"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Fyll utklippsrektangel"
 
-#: ../widgets/text/e-text.c:3565 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X-avstand"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y-avstand"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Tekstbredde"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Teksthøyde"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM-kontekst"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Håndter sprettopp"
 
-#: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "Etter _firma"
+#~ msgid "Organization"
+#~ msgstr "Organisasjon"
 
-#: ../views/addressbook/galview.xml.h:2
-msgid "_Address Cards"
-msgstr "_Adressekort"
+#~ msgid "GTK Tree View"
+#~ msgstr "GTK-trevisning"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "Tele_fonliste"
+#~ msgid "Error loading default addressbook."
+#~ msgstr "Feil under lasting av standard adressebok."
 
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "Uk_evisning"
+#~ msgid "Input File"
+#~ msgstr "Innfil"
 
-#: ../views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "_Dagvisning"
+#~ msgid "No filename provided."
+#~ msgstr "Ingen filnavn spesifisert."
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "_Listevisning"
+#~ msgid "Add Calendar"
+#~ msgstr "Legg til kalender"
 
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "_Månedsvisning"
+#~ msgid "Add Task List"
+#~ msgstr "Legg til oppgaveliste"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "Ar_beidsukevisning"
+#~ msgid "_Add Calendar"
+#~ msgstr "_Legg til kalender"
 
-#: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Som sendt-mappe for _vertikal visning"
+#~ msgid "_Add Task List"
+#~ msgstr "_Legg til oppgaveliste"
 
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "Som _Sendt-mappe"
+#~ msgid "Add New Calendar"
+#~ msgstr "Legg til ny kalender"
 
-#: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "Etter s_tatus"
+#~ msgid "Calendar Group"
+#~ msgstr "Kalendergruppe"
 
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "Etter avse_nder"
+#~ msgid "Calendar Location"
+#~ msgstr "Kalenderlokasjon"
 
-#: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "Etter _emne"
+#~ msgid "Calendar Name"
+#~ msgstr "Kalendernavn"
 
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "Etter opp_følgingsflagg"
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>Alternativer for oppgaveliste</b>"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "For _vertikal visning"
+#~ msgid "Add New Task List"
+#~ msgstr "Legg til ny oppgaveliste"
 
-#: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Meldinger"
+#~ msgid "Task List Group"
+#~ msgstr "Oppgavelistegruppe"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "_Notater"
+#~ msgid "Task List Name"
+#~ msgstr "Navn på oppgaveliste"
 
-#: ../views/tasks/galview.xml.h:1
-msgid "With _Due Date"
-msgstr "Med fer_dig-dato"
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>Ledig/opptatt-k_alendere</b>"
 
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Status"
-msgstr "Med _status"
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>Publiseringsfrekvens</b>"
+
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>_Lokasjon for publisering</b>"
+
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Innstillinger for publisering av ledig/opptatt-tid"
+
+#~ msgid "_Daily"
+#~ msgstr "_Daglig"
+
+#~ msgid "_Manual"
+#~ msgstr "_Manuell"
+
+#~ msgid "_Weekly"
+#~ msgstr "_Ukentlig"
+
+#~ msgid "Enter the password for %s"
+#~ msgstr "Oppgi passord for %s"
+
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+
+#~ msgid "No, Do not Change Status"
+#~ msgstr "Nei, ikke endre status"
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>Innkommende e-post</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>Utgående e-post:</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>Her kan du velge om du vil motta meldinger via en lesekvittering "
+#~ "når en melding du\n"
+#~ "har sendt blir lest, og oppgi hva Evolution skal gjøre når noen ber om en "
+#~ "kvittering ra deg.</small>"
+
+#~ msgid "Always send back a read receipt"
+#~ msgstr "Alltid send en lesekvittering tilbake"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "Spør meg om jeg vil sende en kvittering tilbake"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "Aldri send en kvittering tilbake"
+
+#~ msgid "Read Receipts"
+#~ msgstr "Lesekvittering"
+
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "Spør etter lesekvittering for alle meldinger jeg sender"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr ""
+#~ "Med mindre meldingen sendes til en e-postliste, og ikke til meg personlig"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr ""
+#~ "Hva skal Evolution gjøre når du mottar en e-post med en forespørsel om "
+#~ "lesekvittering?"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientering for trauet."
+
+#~ msgid "Retrieving Message"
+#~ msgstr "Henter melding"
+
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "Prioritetsfilter: «%s»"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "Noen av dine filtre fra Netscape er basert på\n"
+#~ "e-postprioritet, hvilket ikke brukes i Evolution.\n"
+#~ "Evolution gir i stedet poengsummer i området\n"
+#~ "-3 til 3 og disse kan gis til meldinger for å filtrere\n"
+#~ "på dem.\n"
+#~ "\n"
+#~ "For å hjelpe med overgangen er det opprettet et sett med filtre\n"
+#~ "kalt «Prioritetsfiltre», som konverterer e-postprioriteter fra\n"
+#~ "Netscape til poengsummer for bruk med Evolution og filtre som\n"
+#~ "påvirkes av dette endres til å bruke poengsummer i stedet.\n"
+#~ "Sjekk de importerte filtrene for å forsikre deg om at alt\n"
+#~ "fungerer som det skal."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "Noen av dine e-postfiltre fra Netscape bruker\n"
+#~ "funksjonen «Ignorer tråd» eller «Overvåk tråd»\n"
+#~ "og denne er ikke støttet i Evolution.\n"
+#~ "Disse filtrene vil utelates."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "Noen av dine Netscape e-postfiltre sjekker\n"
+#~ "om meldingskroppen er lik en gitt streng. Dette\n"
+#~ "er ikke støttet i Evolution. Disse filtrene ble\n"
+#~ "endret slik at de sjekker om strengen finnes i\n"
+#~ "meldingskroppen eller ikke."
+
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Evolution importerer dine gamle data fra Netscape"
+
+#~ msgid "Importing Netscape data"
+#~ msgstr "Importerer data fra Netscape"
+
+#~ msgid "Settings"
+#~ msgstr "Innstillinger"
+
+#~ msgid "Mail Filters"
+#~ msgstr "E-post filtre"
+
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution har funnet Netscape e-post filer.\n"
+#~ "Vil du importere dem til Evolution?"
+
+#~ msgid "No output directory!"
+#~ msgstr "Ingen mappe for utdata"
+
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr ""
+#~ "Fant ikke mappe det skal skrives til på iPod! Vennligst sjekk at iPod'en "
+#~ "er korrekt satt opp og prøv igjen."
+
+#~ msgid "Could not export data!"
+#~ msgstr "Kunne ikke eksportere data"
+
+#~ msgid "Exporting data failed."
+#~ msgstr "Feil under eksport av data."
+
+#~ msgid "Could not open addressbook!"
+#~ msgstr "Kunne ikke åpne adressebok"
+
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "Kunne ikke åpne Evolution adressebok for å eksportere data."
+
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "Kunne ikke åpne kalender/oppgaveliste"
+
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr ""
+#~ "Kunne ikke åpne Evolution kalender/oppgaveliste for å eksportere data."
+
+#~ msgid "New mail notify"
+#~ msgstr "Varsle ny e-post"
+
+#~ msgid "An attachment to add."
+#~ msgstr "Et vedlegg som skal legges til."
+
+#~ msgid "Content type of the attachment."
+#~ msgstr "Innholdstype for vedlegget."
+
+#~ msgid "The filename to display in the mail."
+#~ msgstr "Filnavnet som skal vises i meldingen."
+
+#~ msgid "Description of the attachment."
+#~ msgstr "Beskrivelse av vedlegget."
+
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "Merk vedlegg for visning i meldingen som forvalg."
+
+#~ msgid "Minicard Test"
+#~ msgstr "Minikort test"
+
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Opphavsrett (C) 2000, Helix Code, Inc."
+
+#~ msgid "This should test the minicard canvas item"
+#~ msgstr "Testprogram for minicard canvas-oppføring"
author	Kjartan Maraas <kmaraas@gnome.org>	2007-06-06 17:14:45 +0800
committer	Kjartan Maraas <kmaraas@src.gnome.org>	2007-06-06 17:14:45 +0800
commit	c43e87ecbaca9612672971e13b2b6836fad1db5f (patch)
tree	383185e643f7d5f03b4ecc21948c88ef2bd3dc43 /po/nb.po
parent	b0dd9fa1e95776beb321ec4582ed8c3da81bddde (diff)
download	gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.gz gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.bz2 gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.lz gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.xz gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.tar.zst gsoc2013-evolution-c43e87ecbaca9612672971e13b2b6836fad1db5f.zip