[evolution] Update Norwegian bokmål translation.



commit b98780dbc5026e291094bddecac301acbfd0a881
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Sep 1 01:32:58 2009 +0200

    Update Norwegian bokmål translation.

 po/nb.po |13696 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 6882 insertions(+), 6814 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 3b21d7a..256ae33 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance lyse net>, 2005.
 #
 #
-#: ../shell/main.c:631
+#: ../shell/main.c:500
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.27.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 12:59+0200\n"
-"PO-Revision-Date: 2009-08-21 13:18+0200\n"
+"POT-Creation-Date: 2009-09-01 01:28+0200\n"
+"PO-Revision-Date: 2009-09-01 01:32+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"
@@ -18,314 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "evolution adressebok"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
-
-#: ../a11y/addressbook/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-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/addressbook/ea-minicard.c:31
-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/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "Har alarmer."
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "Har gjeninntreffelse"
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "Er et møte."
-
-#: ../a11y/calendar/ea-cal-view-event.c:275
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Kalenderhendelse: Sammendraget er %s."
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-msgid "Calendar Event: It has no summary."
-msgstr "Kalenderhendlelse: Har ikke sammendrag."
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "vis kalenderhendelse"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "Ta fokus"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "Ny avtale"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "Ny avtale som varer hele dagen"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "Nytt møte"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "GÃ¥ til i dag"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "GÃ¥ til dato"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:300
-#: ../a11y/calendar/ea-week-view-main-item.c:297
-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:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Har %d hendelse."
-msgstr[1] "Har %d hendelser."
-
-#. 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:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "Har ingen hendelser."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Arbeidsukevisning: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Dagvisning: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "kalendervisning for en arbeidsuke"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "kalendervisning for en eller flere dager"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
-#: ../calendar/gui/e-week-view-main-item.c:368
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
-#: ../calendar/gui/e-week-view-main-item.c:382
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "GNOME kalender"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "søkefelt"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "søkefelt for Evolution kalender"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "Hoppeknapp"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "Klikk her for å finne flere hendelser."
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "MÃ¥nedsvisning: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Ukevisning: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "kalendervisning for en måned"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "kalendervisning for en eller flere uker"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "oppsprett"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "vis et avkom"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "rediger"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "start redigering av denne cellen"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "vend"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "vend cellen"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "utvid"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-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:216
-msgid "collapse"
-msgstr "slå sammen"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-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:120
-msgid "Table Cell"
-msgstr "Celle i tabell"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
-#: ../widgets/table/e-table-click-to-add.c:578
-msgid "click to add"
-msgstr "klikk for å legge til"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "klikk"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "sortere"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalender (fra %s til %s)"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "Evolution kalenderoppføring"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "Komboknapp"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "Bruk forvalg"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "Sprettoppmeny"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -405,7 +97,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1116
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -555,676 +247,20 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:598
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1621
+#: ../addressbook/conduit/address-conduit.c:1622
 msgid "Could not load address book"
 msgstr "Kunne ikke laste adressebok"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1699
+#: ../addressbook/conduit/address-conduit.c:1702
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "K_ontakter"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikater"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure contacts and autocompletion here"
-msgstr "Konfigurer kontakter og automatisk fullføring her"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Address Book"
-msgstr "Evolution adressebok"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book address popup"
-msgstr "Evolution adressebok adressedialog"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution adressebok adressevisning"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution adressebok kortvisning"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book component"
-msgstr "Evolution adressebok-komponent"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-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:11
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-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:97
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1515
-msgid "On This Computer"
-msgstr "PÃ¥ denne datamaskinen"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "PÃ¥ LDAP-tjenere"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:337
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "Opprett en ny kontakt"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "Opprett en ny kontaktliste"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1245
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Adresse_bok"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "Opprett en ny adressebok"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Hvis du velger dette alternativet vil Evolution kun koble til din LDAP-"
-"tjener hvis denne støtter SSL."
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Hvis du velger dette alternativet vil Evolution kun koble til din LDAP-"
-"tjener hvis denne støtter TLS."
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Hvis du velger dette alternativet betyr det at din tjener ikke støtter SSL "
-"eller TLS. Dette betyr at din tilkobling vil være usikker, og at du vil være "
-"sårbar for sikkerhetshull. "
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "Basis"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
-
-#: ../addressbook/gui/component/addressbook-config.c:759
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Dette er porten på LDAP-tjeneren som Evolution vil prøve å koble til. En "
-"liste med standardporter er gitt. Spør din systemadministrator hvilken port "
-"du skal bruke."
-
-#: ../addressbook/gui/component/addressbook-config.c:837
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
-"setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
-
-#: ../addressbook/gui/component/addressbook-config.c:916
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Søkeområdet definerer hvor dypt du ønsker at søket skal gå ned i "
-"katalogtreet. Et søkeområde som «sub» vil ta med alle oppføringer under din "
-"søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
-"basen."
-
-#: ../addressbook/gui/component/addressbook-config.c:1020
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "Generelt"
-
-#: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "Adressebok"
-
-#: ../addressbook/gui/component/addressbook-config.c:1025
-msgid "Server Information"
-msgstr "Tjenerinformasjon"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: ../addressbook/gui/component/addressbook-config.c:1030
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "Detaljer"
-
-#: ../addressbook/gui/component/addressbook-config.c:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "Søker"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "Laster ned"
-
-#: ../addressbook/gui/component/addressbook-config.c:1243
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "Egenskaper for adressebok"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
-msgid "Migrating..."
-msgstr "Flytter..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Flytter «%s»:"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP-tjenere"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "Innstillinger for autofullføring"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Lokasjon og hierarki for kontaktmappene i Evolution er endret siden "
-"Evolution 1.x.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Format for kontaktlister er endret.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"MÃ¥ten Evolution lagrer noen telefonnumre er endret.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Endringslogg og tilordningsfiler for Palm-synkronisering er endret.\n"
-"\n"
-"Vennligst vent mens Evolution migrerer dine mapper..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Endre navn på mappen «%s» til:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "Gi nytt navn på mappe"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "Mappenavn kan ikke inneholde tegnet «/»"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "_Ny adressebok"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "Lagre som vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "End_re navn..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Slett"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "Egenska_per..."
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "Valg av kontaktkilde"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "Aksesserer LDAP-tjener anonymt"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
-msgid "Failed to authenticate.\n"
-msgstr "Kunne ikke autentisere.\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Oppgi passord for %s (bruker %s)"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:500
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Oppgi passord"
-
-#: ../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.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.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.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Plassering til vertikalt felt mellom kort- og listevisningen og "
-"forhåndsvisningsfeltet, i piksler."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr ""
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "Vis forhåndsvisningsområdet"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-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.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.h:9
-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.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid "Vertical pane position"
-msgstr "Posisjon til vertikalt felt"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "Om forhåndsvisningsområdet skal vises."
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: ../addressbook/gui/component/autocompletion-config.c:177
-msgid "Always _show address of the autocompleted contact"
-msgstr "Alltid vi_s adresse for automatisk fullført kontakt"
-
-#: ../addressbook/gui/component/autocompletion-config.c:182
-msgid "Date/Time Format"
-msgstr "Fromat for dato ogklokkeslett"
-
-#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
-msgid "Table column:"
-msgstr "Kolonne i tabell:"
-
-#: ../addressbook/gui/component/autocompletion-config.c:187
-msgid "Look up in address books"
-msgstr "Slå opp i adressebøker"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>Autentisering</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Laster ned</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>Søker</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"Anonymt\n"
-"Bruk e-postadresse\n"
-"Bruk distinguished name (DN)"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "B_la gjennom denne boken til grensen nås"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "Lo_gin"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"En\n"
-"Undernivå"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"SSL-kryptering\n"
-"TLS-kryptering\n"
-"Ingen kryptering"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "Søkefilter"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "Søke_base:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "Søke_filter:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Søkefilter angir type objekter det skal søkes etter når et søk utføres. Hvis "
-"dette ikke endres vil søket bruke objektklassen «person» som forvalg."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "Støttede søkebaser"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"Søkebasen er det distingverte navnet (DN) for oppføringen der dine søk vil "
-"starte. Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Dette er hele navnet på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter "
-"dette tallet for høyt vil adresseboken bli treg."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. Det "
-"brukes kun for visning på skjermen."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "Grense for ne_dlasting:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "_Finn mulige søkebaser"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "Metode for på_logging:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "_Navn:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "_Søkeområde:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "Tj_ener:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "_Tidsavbrudd:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "Br_uk sikker forbindelse:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "kort"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:286
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:720
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "minutter"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
@@ -1272,16 +308,16 @@ msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1238
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1302,7 +338,7 @@ msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../calendar/gui/migration.c:1225
+#: ../modules/calendar/e-memo-shell-migrate.c:250
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
@@ -1334,7 +370,7 @@ msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.c:822
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
@@ -1419,10 +455,10 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:473
+#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
 #: ../plugins/exchange-operations/exchange-delegates.c:951
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:61
@@ -1430,13 +466,13 @@ msgid "Name"
 msgstr "Navn"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-model.c:523
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:542
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
 #: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
@@ -1444,105 +480,118 @@ msgstr "Navn"
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:601
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:598
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "Skype"
 msgstr "Skype"
 
 #. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../mail/em-migrate.c:959
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../modules/mail/e-mail-shell-migrate.c:956
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
 msgid "Home"
 msgstr "Hjemme"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:510
+#: ../calendar/gui/e-calendar-view.c:1599
 msgid "Other"
 msgstr "Andre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:536
+msgid "Error adding contact"
+msgstr "Feil under innlegging av kontakt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+msgid "Error modifying contact"
+msgstr "Feil under endring av kontakt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+msgid "Error removing contact"
+msgstr "Feil under fjerning av kontakt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Target Book"
 msgstr "MÃ¥lbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
 msgid "Changed"
 msgstr "Endret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1550,79 +599,55 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:331
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, 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:326
-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:331
-#, 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:167
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:313
+msgid "Shell"
+msgstr "Skall"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:314
+msgid "The EShell singleton"
 msgstr ""
-"Er du sikker på at du vil\n"
-"slette disse kontaktene?"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid ""
@@ -1684,14 +709,14 @@ msgid "<b>Members</b>"
 msgstr "<b>Medlemmer</b> "
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
-#: ../calendar/gui/e-day-view-time-item.c:812
-#: ../calendar/gui/e-timezone-entry.c:118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Velg..."
 
@@ -1707,25 +732,36 @@ msgstr "_Listenavn:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:928
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
 msgid "_Members"
 msgstr "_Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+msgid "Error adding list"
+msgstr "Feil under innlegging av liste"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+msgid "Error modifying list"
+msgstr "Feil ved endring av liste"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+msgid "Error removing list"
+msgstr "Feil under fjerning av liste"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1228
+#: ../addressbook/gui/widgets/e-addressbook-model.c:513
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:528
 msgid "Book"
 msgstr "Bok"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1248
 msgid "Is New List"
 msgstr "Er ny liste"
 
@@ -1777,54 +813,65 @@ msgstr "Flett kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:851
 #: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:1017
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+msgid "Error getting book view"
+msgstr "Feil under henting av bokvisning"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:533
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:535
 msgid "Query"
 msgstr "Spør"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:460
-msgid "Error getting book view"
-msgstr "Feil under henting av bokvisning"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+msgid "Search Interrupted"
+msgstr "Søk avbrutt"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
+#: ../addressbook/gui/widgets/e-addressbook-view.c:645
+#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
+#: ../modules/calendar/e-memo-shell-content.c:590
+#: ../modules/calendar/e-task-shell-content.c:613
 #: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3344
@@ -1837,112 +884,65 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "Navn begynner med"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
+msgid "Shell View"
+msgstr "Skall-visning"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
 msgid "Source"
 msgstr "Kilde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:564
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
-msgid "Type"
-msgstr "Type"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
-msgid "Save as vCard..."
-msgstr "Lagre som vCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "_Ã?pne"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "Er du sikker på at du vil slette disse kontaktlistene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "_Ny kontakt..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1138
+msgid "Are you sure you want to delete this contact list?"
+msgstr "Er du sikker på at du vil slette denne kontaktlisten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "Ny kontakt_liste..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1142
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "Er du sikker på at du vil slette denne kontaktlisten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "Lagre _som vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1148
+msgid "Are you sure you want to delete these contacts?"
+msgstr "Er du sikker på at du vil slette disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "_Videresend kontakt"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
+msgid "Are you sure you want to delete this contact?"
+msgstr "Er du sikker på at du vil slette denne kontakten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "_Videresend kontakter"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "Send _melding til kontakt"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1156
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "Er du sikker på at du vil slette denne kontakten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "Send _melding til liste"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:744
+msgid "Save as vCard..."
+msgstr "Lagre som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "Send _melding til kontakter"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"�pning av %d kontakt vil medføre at %d nytt vindu vil\n"
+"vises på skjermen. Vil du virkelig vise denne kontakten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "_Skriv ut"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "_Kopier til adressebok..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "_Flytt til adressebok..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "Klipp u_t"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopier"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "_Lim inn"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
-#: ../calendar/gui/cal-search-bar.c:686
-msgid "Any Category"
-msgstr "Enhver kategori"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+msgid "_Don't Display"
+msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Unmatched"
-msgstr "Ingen treff"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+msgid "Display _All Contacts"
+msgstr "Vis _alle kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -1972,7 +972,6 @@ msgstr "Biltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../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
@@ -1980,7 +979,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:613
 msgid "Company"
 msgstr "Firma"
 
@@ -2029,22 +1028,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2073,14 +1072,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Rolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:642
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -2099,6 +1098,7 @@ msgid "Telex"
 msgstr "Teleks"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:550
 msgid "Title"
 msgstr "Tittel"
 
@@ -2113,7 +1113,6 @@ msgstr "Nettside"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
 #: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-group-container.c:994
@@ -2128,7 +1127,6 @@ msgstr "Bredde"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
 #: ../widgets/table/e-table-click-to-add.c:528
 #: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-container.c:988
@@ -2160,11 +1158,11 @@ msgstr "Tekstmodell"
 msgid "Max field name length"
 msgstr "Maksimal lengde på feltnavn"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -2174,7 +1172,7 @@ msgstr ""
 "\n"
 "Søker etter kontakter..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -2188,7 +1186,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -2202,7 +1200,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -2212,7 +1210,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -2222,7 +1220,7 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:521
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -2235,7 +1233,7 @@ msgid "Home Email"
 msgstr "E-post hjemme"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "Annen e-post"
 
@@ -2247,61 +1245,98 @@ msgstr "Valgt"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "_Ã?pne lenke i nettleser"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution adressebok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "_Kopier lokasjon for lenke"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "Ny kontakt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "_Send ny melding til..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+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"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "Ã?pne"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Kontaktliste: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Kontakt: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "evolution minikort"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
+#: ../mail/e-mail-display.c:227
+msgid "_Send New Message To..."
+msgstr "_Send ny melding til..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:206
+#: ../mail/e-mail-display.c:179
+msgid "_Copy Link Location"
+msgstr "_Kopier lokasjon for lenke"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+#: ../mail/e-mail-display.c:189
+msgid "_Open Link in Browser"
+msgstr "_Ã?pne lenke i nettleser"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:374
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:469
+#: ../addressbook/gui/widgets/eab-contact-display.c:818
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
+#: ../modules/calendar/e-cal-shell-view-actions.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:240
+#: ../modules/calendar/e-cal-shell-view.c:173
 #: ../plugins/exchange-operations/exchange-delegates-user.c:75
 #: ../plugins/exchange-operations/exchange-folder.c:572
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
@@ -2313,164 +1348,188 @@ msgstr "Videosamtale"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2580
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../calendar/gui/e-calendar-view.c:1890 ../shell/main.c:124
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2581
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../calendar/gui/e-calendar-view.c:1891
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#. orange
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../modules/addressbook/e-book-shell-backend.c:174
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:191
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:169
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:171
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/mail/e-mail-shell-migrate.c:957
+#: ../plugins/email-custom-header/email-custom-header.c:336
+msgid "Personal"
+msgstr "Personlig"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:836
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:872
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:880
 msgid "Blog"
 msgstr "Weblogg"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "No Self Contact defined"
 msgstr "Egen kontaktinformasjon er ikke definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-cal-model-tasks.c:363
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:781
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2578
 msgid "Canceled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Not available in offline mode"
 msgstr "Ikke tilgjengelig i frakoblet modus"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Other error"
 msgstr "Annen feil"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Invalid server version"
 msgstr "Ugyldig versjon av tjener"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Unsupported authentication method"
 msgstr "Autentiseringsmetoden er ikke støttet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -2480,7 +1539,7 @@ msgstr ""
 "for frakoblet bruk eller at den ikke er lastet ned enda. Last adresseboken i "
 "tilkoblet tilstand for å laste ned innholdet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -2489,7 +1548,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien %s eksisterer "
 "og at du har rettigheter til å aksessere den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -2498,7 +1557,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -2506,11 +1565,11 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:142
 msgid "Detailed error message:"
 msgstr "Detaljert feilmelding:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2522,7 +1581,7 @@ msgstr ""
 "Gjør søket ditt mer nøyaktig eller hev grensen på resultater i\n"
 "brukervalgene til mappetjeneren for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -2534,69 +1593,20 @@ msgstr ""
 "nøyaktig eller hev tidsgrensen i brukervalgene til katalogtjeneren\n"
 "for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Motoren for denne adresseboken forsto ikke denne spørringen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book refused to perform this query."
 msgstr "Motoren for denne adresseboken nektet å utføre denne spørringen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "Feil under innlegging av liste"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "Feil under innlegging av kontakt"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "Feil ved endring av liste"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "Feil under endring av kontakt"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "Feil under fjerning av liste"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "Feil under fjerning av kontakt"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"�pning av %d kontakt vil medføre at %d nytt vindu vil\n"
-"vises på skjermen. Vil du virkelig vise denne kontakten?"
-msgstr[1] ""
-"�pning av %d kontakter vil medføre at %d nye vinduer vil\n"
-"vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "Ikke _vis"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "Vis _alle kontakter"
-
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2605,73 +1615,49 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:354
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Overwrite"
 msgstr "Overskriv"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:255
+#: ../addressbook/gui/widgets/eab-gui-util.c:258
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakter"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:304
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:599
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:602
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:604
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "Flere vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard for %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "Kontaktinformasjon"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "Kontaktinformasjon for %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr "Kjører spørring i adressebok..."
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Kortvisning"
@@ -2680,7 +1666,7 @@ msgstr "Kortvisning"
 #: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Importerer..."
 
@@ -2795,6 +1781,29 @@ msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
+#: ../addressbook/util/addressbook.c:102
+msgid "Accessing LDAP Server anonymously"
+msgstr "Aksesserer LDAP-tjener anonymt"
+
+#: ../addressbook/util/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+msgid "Failed to authenticate.\n"
+msgstr "Kunne ikke autentisere.\n"
+
+#: ../addressbook/util/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Oppgi passord for %s (bruker %s)"
+
+#: ../addressbook/util/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Oppgi passord"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -3200,7 +2209,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:332
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -3222,128 +2231,48 @@ msgstr "_Send melding"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1513
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
-#: ../calendar/conduits/memo/memo-conduit.c:807
-#: ../calendar/conduits/memo/memo-conduit.c:808
-#: ../calendar/conduits/todo/todo-conduit.c:1007
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/calendar/calendar-conduit.c:1520
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/memo/memo-conduit.c:814
+#: ../calendar/conduits/memo/memo-conduit.c:815
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
 msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:908
+#: ../calendar/conduits/memo/memo-conduit.c:911
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for notatliste"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:955
+#: ../calendar/conduits/memo/memo-conduit.c:958
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for notatliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
 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:2549
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgaver"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1238
-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:293 ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Memos"
-msgstr "Notater"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../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"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328 ../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"
@@ -3358,11 +2287,11 @@ msgstr[1] "minutter"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:23
 #: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/calendar-weather/calendar-weather.c:515
 #: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:720
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timer"
@@ -3383,9 +2312,9 @@ msgstr "Se bort fra _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1173
 #: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Sted:"
@@ -3399,14 +2328,12 @@ msgid "_Dismiss"
 msgstr "_Se bort fra"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:110
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "R_ediger"
@@ -3419,32 +2346,44 @@ msgstr "Ut_sett"
 msgid "location of appointment"
 msgstr "lokasjon for avtalen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../modules/addressbook/ldap-config.glade.h:43
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:514
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:719
+msgid "minutes"
+msgstr "minutter"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1516
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1714
 #: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1690
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3456,7 +2395,7 @@ msgstr ""
 "Ã¥ sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3473,15 +2412,15 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:154
+#: ../calendar/gui/alarm-notify/notify-main.c:149
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -3527,7 +2466,7 @@ msgid "Alarm programs"
 msgstr "Varslingsprogrammer"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
@@ -3641,77 +2580,99 @@ 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.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 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.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivået skal meldingen logges."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 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.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farge på Marcus Bains-linje - Dagsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farge på Marcus Bains-linje - tidslinje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#, fuzzy
+msgid "Memo layout style"
+msgstr "Sva_rstil:"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#, fuzzy
+msgid "Memo preview pane position (vertical)"
+msgstr "Plassering av vertikalt felt for månedsvisning"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 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.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "Plassering på horisontal månedsvisningsfelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "Plassering av vertikalt felt for månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 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.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 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.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -3719,7 +2680,7 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom minikalenderen og oppgavelisten "
 "utenom månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3727,21 +2688,25 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom visning, minikalender og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 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.h:50
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Plassering av vertikalt felt mellom oppgavelisten og forhåndsvisningsfeltet "
-"for oppgaver, i piksler."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3749,7 +2714,7 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 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."
@@ -3757,99 +2722,109 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten utenom månedsvisning, i piksler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "Primær kalender"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "Primær notatliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "Primær oppgaveliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 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.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "Katalog for lagring av alarmlyd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 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.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 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.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 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.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "Vis alarmer i varslingsområdet på panelet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 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.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
 msgstr "Vis forhåndsvisningsvinduet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
-msgstr "Vis forhåndsvisningsvinduet."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "Vis forhåndsvisningsvinduet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 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.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 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.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr "Vis ukenummer i dag- og arbeidsukevisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "Vis ukenummer i datovelger"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Tasks due today color"
-msgstr "Farge for oppgaver som går ut i dag"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
 msgstr "Posisjon for vertikalt oppgavefelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#, fuzzy
+msgid "Task preview pane position (vertical)"
+msgstr "Posisjon for vertikalt oppgavefelt"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Tasks due today color"
+msgstr "Farge for oppgaver som går ut i dag"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -3858,7 +2833,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.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -3866,11 +2841,25 @@ 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.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -3878,19 +2867,19 @@ msgstr ""
 "Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
 "feilsøkingsmeldinger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for forrige alarm, som time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -3898,65 +2887,69 @@ msgstr ""
 "Gjennomsiktighet for hendelser i kalendervisningen (En verdi mellom 0 "
 "(gjennomsiktig) og 1 (ugjennomsiktig)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 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.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 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.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "Bruk systemets tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "Posisjon til vertikalt felt"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 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.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 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.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 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.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 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.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3964,276 +2957,90 @@ 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.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 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.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 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.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 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.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 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.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 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.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 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.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 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.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 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.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 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.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Om ukenummer skal vises i dag- og arbeidsukevisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "Hvilken time arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "Hvilket minutt arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "Hvilken time arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
-#: ../calendar/gui/cal-editor-utils.c:100
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "Ugyldig objekt"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "Sammendrag inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "Beskrivelse inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "Kategorien er"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "Kommentar inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "Lokasjon inneholder"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "Oppgaver for de neste 7 dagene"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "Aktive oppgaver"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "Utgåtte oppgaver"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "Fullførte oppgaver"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "Oppgaver med vedlegg"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "Aktive avtaler"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "Avtaler for de neste 7 dagene"
-
-#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Skriv ut"
-
-#: ../calendar/gui/calendar-commands.c:331
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
-"Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
-
-#: ../calendar/gui/calendar-commands.c:337
-msgid "Purge events older than"
-msgstr "Slett hendelser eldre enn"
-
-#: ../calendar/gui/calendar-commands.c:342
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:288
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:722
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "dager"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
-#: ../calendar/gui/tasks-component.c:149
-msgid "On The Web"
-msgstr "PÃ¥ nettet"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "Vær"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
-msgid "Birthdays & Anniversaries"
-msgstr "Fødselsdager og jubileum"
-
-#: ../calendar/gui/calendar-component.c:626
-msgid "_New Calendar"
-msgstr "_Ny kalender"
-
-#: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
-#: ../mail/em-folder-tree.c:2114
-msgid "_Copy..."
-msgstr "_Kopier..."
-
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
-msgid "_Make available for offline use"
-msgstr "_Gjør tilgjengelig for bruk i frakoblet modus"
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
-msgid "_Do not make available for offline use"
-msgstr "_Ikke gjør denne tilgjengelig i frakoblet modus"
-
-#: ../calendar/gui/calendar-component.c:961
-msgid "Failed upgrading calendars."
-msgstr "Feil under oppgradering av kalendere."
-
-#: ../calendar/gui/calendar-component.c:1089
-#, 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:1105
-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:1218
-msgid "Calendar Source Selector"
-msgstr "Valg av kalenderkilde"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "Ny avtale"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Avtale"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "Nytt møte"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "Møt_e"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "Opprett en ny møteforespørsel"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "Ny avtale for hele dagen"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Avtale for hele _dagen"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "Opprett en ny avtale for hele dagen"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "Ny kalender"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Kale_nder"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "Opprett en ny kalender"
-
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Dagvisning"
@@ -4275,16 +3082,16 @@ msgstr "Kategori"
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
+#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Confidential"
 msgstr "Konfidensiell"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
@@ -4317,20 +3124,20 @@ msgstr "Lokasjon"
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
+#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
@@ -4368,22 +3175,6 @@ msgstr "er"
 msgid "is not"
 msgstr "er ikke"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "Feil under åpning av kalenderen"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "Metoden er ikke støttet under åpning av kalender"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "Tilgang nektet ved åpning av kalender"
-
-#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
 #: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Rediger varsel"
@@ -4525,35 +3316,36 @@ msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2993
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../calendar/gui/dialogs/event-page.c:2905
+#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-day-view-time-item.c:788
+#: ../calendar/gui/e-itip-control.c:1159 ../filter/filter-rule.c:946
+#: ../mail/em-account-editor.c:919 ../mail/em-account-editor.c:1728
+#: ../modules/mail/e-mail-junk-hook.c:86
+#: ../plugins/calendar-weather/calendar-weather.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:378
+#: ../plugins/email-custom-header/email-custom-header.c:393
 #: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
-#: ../widgets/misc/e-dateedit.c:1674
-#: ../widgets/misc/e-signature-combo-box.c:74
+#: ../plugins/itip-formatter/itip-formatter.c:2217
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1555
+#: ../widgets/misc/e-dateedit.c:1766
+#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../widgets/table/e-cell-date-edit.c:312
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:493
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:775
 msgid "Time and date:"
 msgstr "Tid og dato:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:776
 msgid "Date only:"
 msgstr "Kun dato:"
 
@@ -4587,12 +3379,12 @@ msgid "<span weight=\"bold\">Alarms</span>"
 msgstr "<span weight=\"bold\">Alarmer</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varsel</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Date/Time Format</span>"
 msgstr "<span weight=\"bold\">Format for dato og tid</span>"
 
@@ -4601,7 +3393,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:13
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
@@ -4631,11 +3423,23 @@ msgid "Display alarms in _notification area only"
 msgstr "Vis alarmer kun i varsli_ngsområdet"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Fredag"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:82
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/addressbook/ldap-config.glade.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:2567
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "Generelt"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
@@ -4647,8 +3451,8 @@ msgstr ""
 "Dager"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4671,7 +3475,7 @@ msgstr ""
 "Søndag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:102
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -4681,8 +3485,8 @@ msgid "S_un"
 msgstr "S_ø."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4717,8 +3521,8 @@ msgid "Show week n_umber in Day and Work Week View"
 msgstr "Vis uken_ummer i dag- og arbeidsukevisning"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4736,8 +3540,8 @@ msgid "Template:"
 msgstr "Mal:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4751,8 +3555,8 @@ msgid "Time format:"
 msgstr "Tidformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4761,8 +3565,8 @@ msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4850,6 +3654,20 @@ msgstr "før hver avtale"
 msgid "Type:"
 msgstr "Type:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:542
+msgid "_Type:"
+msgstr "_Type:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:150
+#: ../modules/addressbook/ldap-config.glade.h:36
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "_Navn:"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
@@ -4949,239 +3767,236 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2350
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2354
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2356
 msgid "Completed "
 msgstr "Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2361
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2363
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
+#: ../calendar/gui/dialogs/comp-editor.c:238
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:501
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:596
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:603
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:605
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:618
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:634
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:788
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppføring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:992
 msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:999
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
+#: ../calendar/gui/dialogs/comp-editor.c:1006
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
+#: ../calendar/gui/dialogs/comp-editor.c:1020
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1048
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1055
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:103
+#: ../shell/e-shell-window-actions.c:1593
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../composer/e-composer-actions.c:304
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Click here to attach a file"
 msgstr "klikk her for å legge ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1186
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slår av/på visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1210
+#: ../composer/e-composer-private.c:68
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Lagre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../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:2801 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:2914 ../mail/em-utils.c:361
 #: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2976
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -5314,94 +4129,81 @@ msgstr "_Ledig/opptatt"
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:292
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:750
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Hendelsen kan ikke redigeres fordi kalenderen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:754
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:2662
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.c:829
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:878
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1064
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1067
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1238
 #: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/task-page.c:833
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1248
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1271
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/event-page.c:1440
 #: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/event-page.c:1446
 #: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/task-page.c:923
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "Fje_rn"
-
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
-msgid "_Add "
-msgstr "_Legg til"
-
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2535
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
@@ -5412,35 +4214,35 @@ msgstr "Kunne ikke åpne kalender «%s»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/event-page.c:2579
 #: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/task-page.c:1717
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2879
 #, 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:2973
+#: ../calendar/gui/dialogs/event-page.c:2885
 #, 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:2979
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, 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:2992
+#: ../calendar/gui/dialogs/event-page.c:2904
 msgid "Customize"
 msgstr "Tilpass"
 
@@ -5459,7 +4261,7 @@ msgid "Attendee_s..."
 msgstr "De_ltakere..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Deltakere"
 
@@ -5489,7 +4291,7 @@ msgid "_Description:"
 msgstr "_Beskrivelse:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/calendar-weather/calendar-weather.c:363
 #: ../plugins/exchange-operations/exchange-calendar.c:247
 #: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
@@ -5502,7 +4304,7 @@ msgstr "_Tid:"
 #: ../calendar/gui/dialogs/event-page.glade.h:19
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-config.glade.h:167 ../mail/mail-dialogs.glade.h:21
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
 #: ../smime/gui/smime-ui.glade.h:49
 msgid ""
@@ -5520,7 +4322,7 @@ msgstr ""
 "i\n"
 "til"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2499
 msgid "Memo"
 msgstr "Notat"
 
@@ -5537,10 +4339,10 @@ msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1037 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:938 ../mail/em-format-html.c:2137
+#: ../mail/em-format-html.c:2195 ../mail/em-format-html.c:2220
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Til"
 
@@ -5554,7 +4356,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:378
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -5595,22 +4397,22 @@ msgstr "Denne og fremtidige instanser"
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:557
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:886
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:926
 msgid "End time of the recurrence was before event's start"
 msgstr "Tid for slutt av gjentakelse var før hendelsens start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:955
 msgid "on"
 msgstr "på"
 
@@ -5618,7 +4420,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1012
 msgid "first"
 msgstr "første"
 
@@ -5627,7 +4429,7 @@ msgstr "første"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "second"
 msgstr "sekund"
 
@@ -5635,7 +4437,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1023
 msgid "third"
 msgstr "tredje"
 
@@ -5643,7 +4445,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1028
 msgid "fourth"
 msgstr "fjerde"
 
@@ -5651,7 +4453,7 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1033
 msgid "fifth"
 msgstr "femte"
 
@@ -5659,13 +4461,13 @@ msgstr "femte"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1062
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -5673,7 +4475,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "1st to 10th"
 msgstr "Første til tiende"
 
@@ -5681,7 +4483,7 @@ msgstr "Første til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -5689,45 +4491,45 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1105
 msgid "day"
 msgstr "dag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1234
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1410
+#: ../calendar/gui/dialogs/recurrence-page.c:1409
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2111
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg å endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg å slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -5736,7 +4538,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Unntak</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Forhåndsvis</b>"
 
@@ -5805,38 +4607,77 @@ msgstr "<span weight=\"bold\">Forskjellig\t</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"Høy\n"
-"Normal\n"
-"Lav\n"
-"Udefinert"
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:221
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2575 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Fullført"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:241
+#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1077
+msgid "High"
+msgstr "Høy"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:218
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:777
+#: ../calendar/gui/e-cal-model-tasks.c:854
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2572
+msgid "In Progress"
+msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"Ikke startet\n"
-"I fremdrift\n"
-"Fullført\n"
-"Avbrutt"
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1075
+msgid "Low"
+msgstr "Lav"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-model.c:1232 ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1076
+msgid "Normal"
+msgstr "Normal"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:775
+#: ../calendar/gui/e-calendar-table.c:218
+#: ../calendar/gui/e-calendar-table.c:229
+#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2569
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ikke startet"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "Pros_ent fullført:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Stat_us:"
 msgstr "Stat_us:"
 
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Udefinert"
+
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "Fullført _dato:"
@@ -5859,36 +4700,37 @@ msgid "Click to change or view the status details of the task"
 msgstr "Klikk for å endre/vise detaljer om status for oppgaven"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:360
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:335
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:338
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-page.c:334
 msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
+msgstr ""
+"Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:338
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:386
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:806
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1674
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -5985,126 +4827,55 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-msgid "I_mport"
-msgstr "I_mporter"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-msgid "Select a Calendar"
-msgstr "Velg en kalender"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-msgid "Select a Task List"
-msgstr "Velg en oppgaveliste"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-msgid "I_mport to Calendar"
-msgstr "I_mporter til kalenderen"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-msgid "I_mport to Tasks"
-msgstr "I_mporter til oppgaver"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
+#: ../calendar/gui/e-cal-component-preview.c:66 ../mail/e-mail-display.c:630
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:135 ../filter/filter-rule.c:863
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:178
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-cal-component-preview.c:220
-msgid "Start Date:"
-msgstr "Startdato:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:215
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "Nettside:"
+#: ../calendar/gui/e-cal-component-preview.c:141
+msgid "Categories:"
+msgstr "Kategorier:"
 
-#: ../calendar/gui/e-cal-component-preview.c:202
-#: ../calendar/gui/e-itip-control.c:1154
+#: ../calendar/gui/e-cal-component-preview.c:174
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:181
+#: ../calendar/gui/e-cal-component-preview.c:192
+msgid "Start Date:"
+msgstr "Startdato:"
+
+#: ../calendar/gui/e-cal-component-preview.c:203
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-itip-control.c:1178
+#: ../calendar/gui/e-cal-component-preview.c:214
+#: ../calendar/gui/e-itip-control.c:1187
 #: ../plugins/exchange-operations/exchange-account-setup.c:283
 #: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-#: ../calendar/gui/e-cal-model-tasks.c:359
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-cal-model-tasks.c:752
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
-msgid "In Progress"
-msgstr "Under arbeid"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-model-tasks.c:361
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Completed"
-msgstr "Fullført"
-
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model-tasks.c:357
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
-msgid "High"
-msgstr "Høy"
-
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
-msgid "Normal"
-msgstr "Normal"
+#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-itip-control.c:1219
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:65
+msgid "Description:"
+msgstr "Beskrivelse:"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
-msgid "Low"
-msgstr "Lav"
+#: ../calendar/gui/e-cal-component-preview.c:286
+msgid "Web Page:"
+msgstr "Nettside:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
@@ -6129,17 +4900,17 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-calendar-table.c:776
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-calendar-table.c:777
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:727
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6149,209 +4920,161 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
 
+#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:523
+#: ../shell/e-shell.c:737
+msgid "Shell Settings"
+msgstr "Innstillinger for skall"
+
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:738
+msgid "Application-wide settings"
+msgstr "Innstillinger for programmet"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-itip-control.c:1333
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
-#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
+#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
+#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:1314 ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2242
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1234
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1236
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-calendar-table.c:335
+#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-view.c:2429
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:1739 ../calendar/gui/e-memo-table.c:306
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2433
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:309
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Udefinert"
-
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:748
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:749
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:750
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:751
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:752
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:753
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:754
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:755
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:756
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
+#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:1973
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../modules/calendar/e-cal-shell-content.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:306
+#: ../modules/calendar/e-task-shell-view-actions.c:323
+#: ../modules/calendar/e-task-shell-view.c:250
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: ../calendar/gui/e-calendar-table.c:1108
+#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
+#: ../calendar/gui/e-calendar-table.c:1403
+#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "Lagre som..."
-
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "Ny _oppgave"
-
-#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
-msgid "Open _Web Page"
-msgstr "_Ã?pne nettside"
-
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "Lagre _som..."
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
-msgid "P_rint..."
-msgstr "Sk_riv ut..."
-
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Kli_pp ut"
-
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "_Lim inn"
-
-#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "Tildel oppg_ave"
-
-#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "_Videresend som iCalendar"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark as Complete"
-msgstr "_Merk som fullført"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_Merk valgte oppgaver som fullført"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "_Merk som ikke-fullført"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Merk valgte oppgaver som ikke-fullført"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "Sle_tt valgte oppgaver"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Klikk for å legge til en oppgave"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ferdig"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Klikk for å legge til en oppgave"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Fullført"
@@ -6377,150 +5100,79 @@ msgstr "Startdato"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2337
-#: ../calendar/gui/e-meeting-list-view.c:601
+#: ../calendar/gui/e-calendar-view.c:1647
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "Flytter oppføringer"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "Kopierer oppføringer"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "Ny _avtale..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "Ny avtale som varer h_ele dagen"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "Nytt _møte"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "_Aktiv visning"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "Velg i_dag"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "_Velg dato..."
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "S_kriv ut..."
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "Kop_ier til kalender..."
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "Fl_ytt til kalender..."
-
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "_Deleger møte..."
-
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "_Sett opp møte..."
-
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "_Videresend som iCalendar..."
-
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "Sva_r"
-
-#: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "Make this Occurrence _Movable"
-msgstr "Gjør denne hendelsen _flyttbar"
-
-#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "Slett denne _hendelsen"
-
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "Slett _alle hendelser"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:2284
-#: ../calendar/gui/e-itip-control.c:1183
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1594
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:2285
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2236
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1597
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2239
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1598
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1759 ../calendar/gui/print.c:2531
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1790
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:102
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:105
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:113
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6533,12 +5185,12 @@ msgstr ""
 #. * 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:747
+#: ../calendar/gui/e-day-view-time-item.c:750
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:771
 msgid "Show the second time zone"
 msgstr "Vis den andre tidssonen"
 
@@ -6548,48 +5200,73 @@ msgstr "Vis den andre tidssonen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:843 ../calendar/gui/e-day-view.c:1888
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1665
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:847 ../calendar/gui/e-day-view.c:1905
+#: ../calendar/gui/e-week-view-main-item.c:368
+#: ../calendar/gui/ea-gnome-calendar.c:189
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1921
+#: ../calendar/gui/e-week-view-main-item.c:382
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1047
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1124 ../calendar/gui/e-week-view.c:510
+#: ../calendar/gui/print.c:824
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/e-day-view.c:1127 ../calendar/gui/e-week-view.c:513
+#: ../calendar/gui/print.c:826
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2309
+#: ../calendar/gui/e-day-view.c:2626
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:767
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:784
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hver dag"
 msgstr[1] "Hver %d dag"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hver uke"
 msgstr[1] "Hver %d uker"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:804
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6597,35 +5274,35 @@ msgstr[0] "Hver uke på "
 msgstr[1] "Hver %d uker på "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:815
 msgid " and "
 msgstr " og "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:824
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:840
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:851
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hver måned"
 msgstr[1] "hver %d måneder"
 
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:863
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hvert år"
 msgstr[1] "Hvert %d år"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:876
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6633,36 +5310,36 @@ msgstr[0] " totalt %d gang"
 msgstr[1] " totalt %d ganger"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:887
 msgid ", ending on "
 msgstr ", slutter på "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Starts"
 msgstr "Starter"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:923
 msgid "Ends"
 msgstr "Slutter"
 
-#: ../calendar/gui/e-itip-control.c:954
+#: ../calendar/gui/e-itip-control.c:963
 #: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:1004 ../calendar/gui/e-itip-control.c:1061
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1021
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
+#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -6673,7 +5350,7 @@ msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1144
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6681,279 +5358,281 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../calendar/gui/e-itip-control.c:1196
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../calendar/gui/e-itip-control.c:1274
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Møtet er avlyst, men det ble ikke funnet i dine kalendere."
 
-#: ../calendar/gui/e-itip-control.c:1276
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgaven er avlyst men den ble ikke funnet i dine oppgavelister"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1371
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1372
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> ønsker å være med på et eksisterende møte."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1383
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1384
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på en møteforespørsel."
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> har avlyst et møte."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1400
 msgid "Meeting Cancelation"
 msgstr "Møteavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1527
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig melding."
 
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1438
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1439
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> forespør at %s utfører en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1448
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> forespør at du utfører en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1449
 msgid "Task Proposal"
 msgstr "Forslag til oppgave"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ønsker å være med på en eksisterende oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1468
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på en oppgavetildeling."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1469
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Task Cancelation"
 msgstr "Avlysning av oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1512
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1504
+#: ../calendar/gui/e-itip-control.c:1513
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1517
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1518
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1522
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1523
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1528
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1604
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1663
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1696
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1734
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2010
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: ../calendar/gui/e-itip-control.c:2018
+#: ../calendar/gui/e-itip-control.c:2027
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2045
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2069
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2076
+#: ../plugins/itip-formatter/itip-formatter.c:1394
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2107 ../calendar/gui/e-itip-control.c:2164
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2290
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-meeting-list-view.c:586
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2359
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2374
+#: ../calendar/gui/e-itip-control.c:2383
 #: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2384
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: ../calendar/gui/e-itip-control.c:2376
+#: ../calendar/gui/e-itip-control.c:2385
 #: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2410
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2434
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2458
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2482
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -6985,89 +5664,89 @@ msgstr "Organisator:"
 msgid "Server Message:"
 msgstr "Tjenermelding:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:974 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:975
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:976
 msgid "Room"
 msgstr "Rom"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:990
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:992
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:993
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Trenger handling"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:544
+#: ../calendar/gui/e-meeting-list-view.c:541
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 msgid "In Process"
 msgstr "Under arbeid"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2272
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7076,7 +5755,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2303
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -7086,67 +5765,67 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "A_ttendees..."
 msgstr "Del_takere..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:609
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:639
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:657
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:672
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:689
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:762
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:799
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -7174,100 +5853,189 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "Sle_tt valgte notater"
+#: ../calendar/gui/e-memo-table.c:647
+#: ../modules/calendar/e-cal-shell-content.c:429
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view.c:176
+msgid "Memos"
+msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klikk for å legge til et notat"
 
-#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Velg tidssone"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1646
+msgid "%d %B"
+msgstr "%d %B"
+
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "Har alarmer."
+
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "Har gjeninntreffelse"
+
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "Er et møte."
+
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"Feil på «%s»:\n"
-" %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalenderhendelse: Sammendraget er %s."
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "Laster notater"
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "Kalenderhendlelse: Har ikke sammendrag."
+
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "vis kalenderhendelse"
+
+#: ../calendar/gui/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "Ta fokus"
+
+#: ../calendar/gui/ea-cal-view.c:298
+msgid "New Appointment"
+msgstr "Ny avtale"
+
+#: ../calendar/gui/ea-cal-view.c:299
+msgid "New All Day Event"
+msgstr "Ny avtale som varer hele dagen"
 
-#: ../calendar/gui/e-memos.c:897
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Meeting"
+msgstr "Nytt møte"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "Go to Today"
+msgstr "GÃ¥ til i dag"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "Go to Date"
+msgstr "GÃ¥ til dato"
+
+#: ../calendar/gui/ea-day-view-main-item.c:300
+#: ../calendar/gui/ea-week-view-main-item.c:297
+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."
+#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Opening memos at %s"
-msgstr "�pner notat på %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Har %d hendelse."
+msgstr[1] "Har %d hendelser."
 
-#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "Sletter valgte objekter..."
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "Har ingen hendelser."
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "Laster oppgaver"
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:158
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Arbeidsukevisning: %s. %s"
 
-#: ../calendar/gui/e-tasks.c:1052
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "�pner oppgaver på %s"
+msgid "Day View: %s. %s"
+msgstr "Dagvisning: %s. %s"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "Fullfører oppgaver..."
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "kalendervisning for en arbeidsuke"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "Tømmer"
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for one or more days"
+msgstr "kalendervisning for en eller flere dager"
 
-#: ../calendar/gui/e-timezone-entry.c:124
-msgid "Select Timezone"
-msgstr "Velg tidssone"
+#: ../calendar/gui/ea-gnome-calendar.c:186
+#: ../modules/calendar/e-cal-shell-view-private.c:1007
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
-msgid "%d %B"
-msgstr "%d %B"
+#: ../calendar/gui/ea-gnome-calendar.c:191
+#: ../calendar/gui/ea-gnome-calendar.c:196
+#: ../calendar/gui/ea-gnome-calendar.c:198
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../modules/calendar/e-cal-shell-view-private.c:1020
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "_Egendefinert visning"
+#: ../calendar/gui/ea-gnome-calendar.c:215
+#: ../calendar/gui/ea-gnome-calendar.c:221
+#: ../calendar/gui/ea-gnome-calendar.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../modules/calendar/e-cal-shell-view-private.c:1040
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
+#: ../modules/calendar/e-cal-shell-view-private.c:1058
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "_Lagre egendefinert visning"
+#: ../calendar/gui/ea-gnome-calendar.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
+msgid "Gnome Calendar"
+msgstr "GNOME kalender"
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "_Definer visninger..."
+#: ../calendar/gui/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "Hoppeknapp"
+
+#: ../calendar/gui/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "Klikk her for å finne flere hendelser."
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "Laster avtaler på %s"
+msgid "Month View: %s. %s"
+msgstr "MÃ¥nedsvisning: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "Laster oppgaver på %s"
+msgid "Week View: %s. %s"
+msgstr "Ukevisning: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "kalendervisning for en måned"
+
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:2940
+#: ../calendar/gui/gnome-cal.c:1940
 #, c-format
-msgid "Loading memos at %s"
-msgstr "Laster notat på %s"
+msgid "Loading appointments at %s"
+msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#: ../calendar/gui/gnome-cal.c:2026
 #, c-format
 msgid "Opening %s"
 msgstr "Ã?pner %s"
 
-#: ../calendar/gui/gnome-cal.c:4012
-msgid "Purging"
-msgstr "Sletter"
-
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid ""
 "January\n"
@@ -7304,32 +6072,32 @@ msgstr "Velg dato"
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:642
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -7337,7 +6105,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:676
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -7346,7 +6114,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:683
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -7358,7 +6126,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Avslått"
@@ -7367,7 +6135,7 @@ msgstr "Avslått"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:697
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -7375,7 +6143,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:710
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -7383,7 +6151,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:717
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7391,7 +6159,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:724
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -7399,429 +6167,222 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:731
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:801
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:809
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:981
+#: ../calendar/gui/itip-utils.c:980
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "_Ny notatliste"
-
-#: ../calendar/gui/memos-component.c:560
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d notat"
-msgstr[1] "%d notater"
-
-#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d valgt"
-msgstr[1] ", %d valgt"
-
-#: ../calendar/gui/memos-component.c:609
-msgid "Failed upgrading memos."
-msgstr "Feil under oppgradering av notater."
-
-#: ../calendar/gui/memos-component.c:739
-#, 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:752
-msgid "There is no calendar available for creating memos"
-msgstr "Ingen kalender tilgjengelig for opppretting av notater"
-
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "Valgt av notatkilde"
-
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "Nytt notat"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "N_otat"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "Lag et nytt notat"
-
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "Nytt delt notat"
-
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "_Delt notat"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "Lag et nytt delt notat"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "Ny notatliste"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Notatli_ste"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "Lag en ny notatliste"
-
-#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "Skriv ut notater"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Lokasjon og hierarki for Evolutions oppgavemapper er endret siden Evolution "
-"1.x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Lokasjon og hierarki for Evolutions kalendermapper er endret siden Evolution "
-"1.x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
-#, c-format
-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:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Kan ikke migrere kalender «%s»"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Kan ikke migrere oppgaver «%s»"
-
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:510
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:511
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:512
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:513
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:514
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:515
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:516
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "Su"
 msgstr "Sø."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:592
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:593
 msgid "Sa"
 msgstr "Lø."
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2495
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2497
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2522
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2545
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2614
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2638
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2649
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "_Ny oppgaveliste"
-
-#: ../calendar/gui/tasks-component.c:553
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d oppgave"
-msgstr[1] "%d oppgaver"
-
-#: ../calendar/gui/tasks-component.c:602
-msgid "Failed upgrading tasks."
-msgstr "Feil under oppgradering av oppgaver."
-
-#: ../calendar/gui/tasks-component.c:735
-#, 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:748
-msgid "There is no calendar available for creating tasks"
-msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "Valgt av oppgavekilde"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "Ny oppgave"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "_Oppgave"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "Opprett en ny oppgave"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "Ny tildelt oppgave"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Til_delt oppgave"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "Opprett en ny tildelt oppgave"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "Ny oppgaveliste"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "Oppgave_liste"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "Opprett en ny oppgaveliste"
-
-#: ../calendar/gui/tasks-control.c:484
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"Denne operasjonen vil fjerne alle oppgaver merket som slettet permanent. "
-"Hvis du fortsetter vil du ikke kunne gjenopprette disse oppgavene. \n"
-"\n"
-"Vil du virkelig slette disse oppgavene?"
-
-#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "Ikke spør meg igjen."
-
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "Skriv ut oppgaver"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7849,7 +6410,7 @@ msgstr "Avtaler og møter"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Opening calendar"
 msgstr "Ã?pner kalender"
 
@@ -9430,180 +7991,175 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikke hente melding fra editor"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:202
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-memo-shell-view-actions.c:489
+#: ../modules/calendar/e-task-shell-view-actions.c:638
+msgid "Save as..."
+msgstr "Lagre som..."
+
+#: ../composer/e-composer-actions.c:306
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:311
+#: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:313
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:318
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:325
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:334
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:339
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:341
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:346
 msgid "Save as _Draft"
 msgstr "Lagre som ut_kast"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:348
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:353 ../composer/e-composer-private.c:192
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:355
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:362
 msgid "Insert Send options"
 msgstr "Sett inn alternativer for sending"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:367
 msgid "New _Message"
 msgstr "Ny _melding"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:369
 msgid "Open New Message window"
 msgstr "Ã?pne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:376
 msgid "Character _Encoding"
 msgstr "T_egnkoding"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:383
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:393
 msgid "PGP _Encrypt"
 msgstr "Krypt_er med PGP"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:401
 msgid "PGP _Sign"
 msgstr "_Signer med PGP"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:409
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:411
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:417
 msgid "Re_quest Read Receipt"
 msgstr "S_pør om lesekvittering"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:419
 msgid "Get delivery notification when your message is read"
 msgstr "Motta leveringsmelding når meldingen blir lest"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:425
 msgid "S/MIME En_crypt"
 msgstr "_Krypter med S/MIME"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:427
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:433
 msgid "S/MIME Sig_n"
 msgstr "Sig_ner med S/MIME"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:435
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:441
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:443
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:449
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:451
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:457
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:459
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:465
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:467
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:510
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-composer-header.c:120
-msgid "Show"
-msgstr "Vis"
-
-#: ../composer/e-composer-header.c:123
-msgid "Hide"
-msgstr "Skjul"
+#: ../composer/e-composer-autosave.c:445
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente melding fra editor"
 
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
@@ -9621,65 +8177,58 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:949
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:949
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:936
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:301
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "Fra"
 
-#: ../composer/e-composer-header-table.c:954
+#: ../composer/e-composer-header-table.c:958
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:963
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:969
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
+#: ../composer/e-composer-header-table.c:969
+msgid "Show CC"
+msgstr "Vis CC"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "Bcc"
+#: ../composer/e-composer-header-table.c:975
+msgid "Show BCC"
+msgstr "Vis BCC"
 
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:984
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:993
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:104
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "Destinasjon for post"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "Velg mapper meldingen skal postes til."
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
@@ -9687,14 +8236,20 @@ msgstr "Klikk her for å velge mapper å poste til"
 msgid "Save draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-msg-composer.c:807
+#. Check buttons
+#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:148
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+msgid "_Do not show this message again."
+msgstr "Ikke vis _denne meldingen igjen."
+
+#: ../composer/e-msg-composer.c:900
 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:814
+#: ../composer/e-msg-composer.c:907
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9702,11 +8257,11 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
+#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2112
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3347
+#: ../composer/e-msg-composer.c:3320
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9871,7 +8426,7 @@ msgstr "L_agre skisse"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
@@ -9887,9 +8442,84 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Baltisk"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Sentral-europeisk"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Kinesisk"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Kyrillisk"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Gresk"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebraisk"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japansk"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Koreansk"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thai"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Tyrkisk"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Vest-europeisk"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Vest-europeisk, ny"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "Tradisjonell"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "Forenklet"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "Ukrainsk"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "Synlig"
+
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+#: ../e-util/e-datetime-format.c:188
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "I dag"
 
@@ -9938,19 +8568,24 @@ msgid "Evolution Query"
 msgstr "Evolution spørring"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:448
+#: ../e-util/e-error.c:453
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern feil, ukjent feil «%s» forespurt"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "Komponent"
-
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
+#: ../e-util/e-logger.c:172
+#, fuzzy
+msgid "Name of the logger"
 msgstr "Navn på komponenten som logges"
 
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "Filnavn"
+
+#: ../e-util/e-module.c:189
+msgid "The filename of the module"
+msgstr "Filnavn for denne modulen"
+
 #: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Feilsøkingslogger"
@@ -9974,17 +8609,17 @@ msgid "Log Level"
 msgstr "Loggnivå"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:380
+#: ../widgets/misc/e-dateedit.c:493
 msgid "Time"
 msgstr "Tid"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2632
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:96
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -10008,14 +8643,15 @@ msgstr "Feilsøk"
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
-#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../e-util/e-plugin.c:290 ../filter/rule-editor.c:802
+#: ../modules/mail/em-composer-prefs.c:474
+#: ../plugins/plugin-manager/plugin-manager.c:348
 #: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:291
 msgid "Whether the plugin is enabled"
 msgstr "Om tillegget er aktivert"
 
@@ -10072,176 +8708,224 @@ msgstr "Kunne ikke åpne lenken."
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "V_iktig"
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-feil: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "Ar_beid"
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr "Alle videre feil blir kun vist på konsollet."
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "_Personlig"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:937
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "Svar-til"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "_Oppgaver"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:939
+#: ../mail/em-format-html.c:2138 ../mail/em-format-html.c:2202
+#: ../mail/em-format-html.c:2223 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "_Senere"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2139 ../mail/em-format-html.c:2208
+#: ../mail/em-format-html.c:2226 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Bcc"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "Etikett_navn:"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:941
+#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:305 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1112
+msgid "Subject"
+msgstr "Emne"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "Rediger etikett"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2318
+#: ../modules/mail/em-mailer-prefs.c:1120
+msgid "Mailer"
+msgstr "E-postprogram"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "Legg til etikett"
+#: ../em-format/em-format-quote.c:429 ../mail/em-composer-utils.c:1135
+msgid "-------- Forwarded Message --------"
+msgstr "---------Videresendt melding-------"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "Etikettnavnet kan ikke være tomt."
+#: ../em-format/em-format.c:942 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:429
+#: ../widgets/misc/e-dateedit.c:451
+msgid "Date"
+msgstr "Dato"
 
-#: ../e-util/e-util-labels.c:367
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr ""
-"Det eksisterer allerede en etikett med samme tagg på tjeneren. Gi etiketten "
-"et nytt navn"
+#: ../em-format/em-format.c:943 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "Nyhetsgrupper"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+msgid "Face"
+msgstr "Ansikt"
+
+#: ../em-format/em-format.c:1297
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf-feil: %s"
+msgid "%s attachment"
+msgstr "%s-vedlegg"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "Alle videre feil blir kun vist på konsollet."
+#: ../em-format/em-format.c:1335
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../filter/filter-datespec.c:73
+#: ../em-format/em-format.c:1472 ../em-format/em-format.c:1629
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: ../em-format/em-format.c:1480
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
+
+#: ../em-format/em-format.c:1490
+msgid "Could not parse PGP/MIME message"
+msgstr "Kunne ikke lese PGP/MIME-melding"
+
+#: ../em-format/em-format.c:1490
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
+
+#: ../em-format/em-format.c:1648
+msgid "Unsupported signature format"
+msgstr "Ustøttet signaturformat"
+
+#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1794
+msgid "Error verifying signature"
+msgstr "Feil under verifisering av signatur"
+
+#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1785
+#: ../em-format/em-format.c:1794
+msgid "Unknown error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
+#: ../em-format/em-format.c:1868
+msgid "Could not parse PGP message"
+msgstr "Kunne ikke lese PGP-melding"
+
+#: ../em-format/em-format.c:1868
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Kunne ikke lese PGP-melding: Ukjent feil"
+
+#: ../filter/filter-datespec.c:81
 #, 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:74
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund i fremtiden"
 msgstr[1] "%d sekunder i fremtiden"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:82
 #, 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:76
+#: ../filter/filter-datespec.c:82
 #, 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:77
+#: ../filter/filter-datespec.c:83
 #, 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:78
+#: ../filter/filter-datespec.c:83
 #, 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:79
+#: ../filter/filter-datespec.c:84
 #, 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:80
+#: ../filter/filter-datespec.c:84
 #, 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:81
+#: ../filter/filter-datespec.c:85
 #, 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:82
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 uke i fremtiden"
 msgstr[1] "%d uker i fremtiden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:86
 #, 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:86
 #, 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:85
+#: ../filter/filter-datespec.c:87
 #, 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:86
+#: ../filter/filter-datespec.c:87
 #, 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:294
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:447
+#: ../filter/filter-datespec.c:442
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
@@ -10250,60 +8934,59 @@ msgid "Choose a file"
 msgstr "Velg en fil"
 
 #: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:854
+#: ../filter/filter-rule.c:858
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/filter-rule.c:886
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppføringer som møter følgende kriterier"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/filter-rule.c:920
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:926
 msgid "If all conditions are met"
 msgstr "Hvis alle kriterier er møtt"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:926
 msgid "If any conditions are met"
 msgstr "Hvis noe kriterie er møtt"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/filter-rule.c:928
 msgid "_Find items:"
 msgstr "_Finn oppføringer:"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:948
 msgid "I_nclude threads"
 msgstr "Ta _med tråder"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:299
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:300
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10423,127 +9106,725 @@ msgstr ""
 "klokkeslett du oppgir\n"
 "et klokkeslett relativt til klokkeslettet nå"
 
-#: ../filter/rule-editor.c:381
+#: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/rule-editor.c:462
+#: ../filter/rule-editor.c:465
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../filter/rule-editor.c:808
+#: ../filter/rule-editor.c:812
 msgid "Rule name"
 msgstr "Regelnavn"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Brukervalg for redigering"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1271
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Vedlegg"
+msgstr[1] "Vedlegg"
+
+#: ../mail/e-mail-attachment-bar.c:614
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Ikonvisning"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "Listevisning"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-browser.c:618
+#, fuzzy
+msgid "Shell Module"
+msgstr "Utvalgsmodus"
+
+#: ../mail/e-mail-browser.c:619 ../mail/message-list.c:2516
+msgid "The mail shell backend"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:629
+msgid "Show Deleted"
+msgstr "Vis slettede"
+
+#: ../mail/e-mail-browser.c:630
+msgid "Show deleted messages"
+msgstr "Vis slettede meldinger"
+
+#: ../mail/e-mail-browser.c:664
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../mail/e-mail-display.c:199
+msgid "_Add to Address Book..."
+msgstr "Legg til i _adressebok..."
+
+#: ../mail/e-mail-display.c:206
+msgid "_Copy Email Address"
+msgstr "_Kopier e-postadresse"
+
+#: ../mail/e-mail-display.c:213
+msgid "_To This Address"
+msgstr "_Til denne adressen"
+
+#: ../mail/e-mail-display.c:220
+msgid "_From This Address"
+msgstr "_Fra denne adressen"
+
+#: ../mail/e-mail-display.c:236
+msgid "Create Search _Folder"
+msgstr "Opprett søke_mappe"
+
+#: ../mail/e-mail-display.c:620
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klikk for å sende melding til %s"
+
+#: ../mail/e-mail-display.c:622 ../mail/e-mail-display.c:624
+#: ../mail/e-mail-display.c:626
+#, c-format
+msgid "Click to call %s"
+msgstr "Klikk for å ringe %s"
+
+#: ../mail/e-mail-display.c:628
+msgid "Click to hide/unhide addresses"
+msgstr "Klikk for å skjule/vise adresser"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "_Navn på etikett:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "V_iktig"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "Ar_beid"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Personlig"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "_Oppgaver"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_Senere"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:514
+msgid "Add Label"
+msgstr "Legg til etikett"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Rediger etikett"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
+"Merk: Understrek i etikettnavnet brukes som hurtigtastidentifikator i menyen."
 
-#: ../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/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "Farge"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:599 ../mail/em-folder-tree.c:2337
+#: ../modules/mail/e-mail-shell-view-private.c:1000
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Innboks"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "Konfigurer innstillinger for nettverkstilkobling her"
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:592
+msgid "Drafts"
+msgstr "Skisser"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:602
+msgid "Outbox"
+msgstr "Utboks"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:604
+msgid "Sent"
+msgstr "Sendt"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:595
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:565
+msgid "Templates"
+msgstr "Maler"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigering"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:107
+#: ../modules/calendar/e-task-shell-view-actions.c:598
+msgid "Do not ask me again"
+msgstr "Ikke spør meg igjen"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
+#: ../mail/e-mail-reader.c:172 ../mail/e-mail-reader.c:559
+#: ../mail/em-account-editor.c:667 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
+msgid "Select Folder"
+msgstr "Velg mappe"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
+#: ../mail/e-mail-reader.c:172 ../mail/em-folder-utils.c:371
+msgid "C_opy"
+msgstr "K_opier"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Konfigurasjonskontroll for nettverk i Evolution"
+#: ../mail/e-mail-reader.c:559 ../mail/em-folder-utils.c:371
+msgid "_Move"
+msgstr "_Flytt"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "E-post"
+#: ../mail/e-mail-reader.c:1037
+msgid "A_dd Sender to Address Book"
+msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "E-post-konti"
+#: ../mail/e-mail-reader.c:1039
+msgid "Add sender to address book"
+msgstr "Legg til avsender i adressebok"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "Brukervalg for e-post"
+#: ../mail/e-mail-reader.c:1044
+msgid "Check for _Junk"
+msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "Brukervalg for nettverk"
+#: ../mail/e-mail-reader.c:1046
+msgid "Filter the selected messages for junk status"
+msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "_E-post"
+#: ../mail/e-mail-reader.c:1053
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopier valgte meldinger til utklippstavlen"
+
+#: ../mail/e-mail-reader.c:1058
+msgid "_Copy to Folder..."
+msgstr "K_opier til mappe..."
+
+#: ../mail/e-mail-reader.c:1060
+msgid "Copy selected messages to another folder"
+msgstr "Kopier valgte meldinger til en annen mappe"
+
+#: ../mail/e-mail-reader.c:1065
+msgid "_Delete Message"
+msgstr "_Slett melding"
+
+#: ../mail/e-mail-reader.c:1067
+msgid "Mark the selected messages for deletion"
+msgstr "Merk valgte meldinger for sletting"
+
+#: ../mail/e-mail-reader.c:1072
+msgid "Filter on Mailing _List..."
+msgstr "Filtrer på e-post_liste..."
+
+#: ../mail/e-mail-reader.c:1074
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
+
+#: ../mail/e-mail-reader.c:1079
+msgid "Filter on _Recipients..."
+msgstr "Filtrer på mottake_re..."
+
+#: ../mail/e-mail-reader.c:1081
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
+
+#: ../mail/e-mail-reader.c:1086
+msgid "Filter on Se_nder..."
+msgstr "Filtrer på se_nder..."
+
+#: ../mail/e-mail-reader.c:1088
+msgid "Create a rule to filter messages from this sender"
+msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
+
+#: ../mail/e-mail-reader.c:1093
+msgid "Filter on _Subject..."
+msgstr "Filtrer på e_mne..."
+
+#: ../mail/e-mail-reader.c:1095
+msgid "Create a rule to filter messages with this subject"
+msgstr "Lag en regel for filtrering av meldinger med dette emnet"
+
+#: ../mail/e-mail-reader.c:1100
+msgid "A_pply Filters"
+msgstr "_Påfør filtre"
+
+#: ../mail/e-mail-reader.c:1102
+msgid "Apply filter rules to the selected messages"
+msgstr "Aktiver filterregler på de valgte meldingene"
+
+#: ../mail/e-mail-reader.c:1107
+msgid "_Find in Message..."
+msgstr "_Finn i melding..."
+
+#: ../mail/e-mail-reader.c:1109
+msgid "Search for text in the body of the displayed message"
+msgstr "Søk etter tekst i kroppen av vist melding"
+
+#: ../mail/e-mail-reader.c:1114
+msgid "_Clear Flag"
+msgstr "F_jern flagg"
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/e-mail-reader.c:1116
+#, fuzzy
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Lag en ny oppgave fra den valgte meldingen"
+
+#: ../mail/e-mail-reader.c:1121
+msgid "_Flag Completed"
+msgstr "Merk som _fullført"
+
+#: ../mail/e-mail-reader.c:1123
+#, fuzzy
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
+
+#: ../mail/e-mail-reader.c:1128
+msgid "Follow _Up..."
+msgstr "Følg _opp..."
+
+#: ../mail/e-mail-reader.c:1130
+#, fuzzy
+msgid "Flag the selected messages for follow-up"
+msgstr "Merk valgte meldinger for oppfølging"
+
+#: ../mail/e-mail-reader.c:1135
+#: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../mail/e-mail-reader.c:1137
+msgid "Forward the selected message to someone"
+msgstr "Videresend den valgte meldingen til noen"
+
+#: ../mail/e-mail-reader.c:1142
+msgid "_Attached"
+msgstr "L_agt ved"
+
+#: ../mail/e-mail-reader.c:1144
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Videresend den valgte meldingen til noen som et vedlegg"
+
+#: ../mail/e-mail-reader.c:1149
+msgid "_Inline"
+msgstr "_I meldingen"
+
+#: ../mail/e-mail-reader.c:1151
+msgid "Forward the selected message in the body of a new message"
+msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
+
+#: ../mail/e-mail-reader.c:1156
+msgid "_Quoted"
+msgstr "_Sitert"
+
+#: ../mail/e-mail-reader.c:1158
+msgid "Forward the selected message quoted like a reply"
+msgstr "Videresend den valgte meldingen sitert som et svar"
+
+#: ../mail/e-mail-reader.c:1163
+msgid "_Load Images"
+msgstr "_Last bilder"
+
+#: ../mail/e-mail-reader.c:1165
+msgid "Force images in HTML mail to be loaded"
+msgstr "Tvungen lasting av bilder i HTML e-post"
+
+#: ../mail/e-mail-reader.c:1170
+msgid "_Important"
+msgstr "V_iktig"
+
+#: ../mail/e-mail-reader.c:1172
+msgid "Mark the selected messages as important"
+msgstr "Merk valgte meldinger som viktige"
+
+#: ../mail/e-mail-reader.c:1177
+msgid "_Junk"
+msgstr "_Uønsket e-post"
+
+#: ../mail/e-mail-reader.c:1179
+msgid "Mark the selected messages as junk"
+msgstr "Merk valgte meldinger som uønsket e-post"
+
+#: ../mail/e-mail-reader.c:1184
+msgid "_Not Junk"
+msgstr "_Ikke uønsket e-post"
+
+#: ../mail/e-mail-reader.c:1186
+#, fuzzy
+msgid "Mark the selected messasges as not being junk"
+msgstr "Merk valgte meldinger som ønsket e-post"
+
+#: ../mail/e-mail-reader.c:1191
+msgid "_Read"
+msgstr "_Les"
+
+#: ../mail/e-mail-reader.c:1193
+msgid "Mark the selected messages as having been read"
+msgstr "Merk valgte meldinger som lest"
+
+#: ../mail/e-mail-reader.c:1198
+msgid "Uni_mportant"
+msgstr "_Ikke viktig"
+
+#: ../mail/e-mail-reader.c:1200
+msgid "Mark the selected messages as unimportant"
+msgstr "Merk valgte meldinger som uviktige"
+
+#: ../mail/e-mail-reader.c:1205
+msgid "_Unread"
+msgstr "_Ulest"
+
+#: ../mail/e-mail-reader.c:1207
+msgid "Mark the selected messages as not having been read"
+msgstr "Merk valgte meldinger som ulest"
+
+#: ../mail/e-mail-reader.c:1212
+msgid "_Edit as New Message..."
+msgstr "R_ediger som ny melding..."
+
+#: ../mail/e-mail-reader.c:1214
+msgid "Open the selected messages in the composer for editing"
+msgstr "Ã?pne valgte meldinger i redigeringskomponenten"
+
+#: ../mail/e-mail-reader.c:1219
+msgid "Compose _New Message"
+msgstr "Skriv _ny melding"
+
+#: ../mail/e-mail-reader.c:1221
+msgid "Open a window for composing a mail message"
+msgstr "�pne et vindu for å skrive en e-post melding"
+
+#: ../mail/e-mail-reader.c:1226
+msgid "_Open in New Window"
+msgstr "_Ã?pne i _nytt vindu"
+
+#: ../mail/e-mail-reader.c:1228
+msgid "Open the selected messages in a new window"
+msgstr "Ã?pne valgte meldinger i et nytt vindu"
+
+#: ../mail/e-mail-reader.c:1233
+msgid "_Move to Folder..."
+msgstr "Fl_ytt til mappe..."
+
+#: ../mail/e-mail-reader.c:1235
+msgid "Move selected messages to another folder"
+msgstr "Flytt valgte meldinger til en annen mappe"
+
+#: ../mail/e-mail-reader.c:1240
+msgid "_Next Message"
+msgstr "_Neste melding"
+
+#: ../mail/e-mail-reader.c:1242
+msgid "Display the next message"
+msgstr "Vis neste melding"
+
+#: ../mail/e-mail-reader.c:1247
+msgid "Next _Important Message"
+msgstr "Neste v_iktige melding"
+
+#: ../mail/e-mail-reader.c:1249
+msgid "Display the next important message"
+msgstr "Vis neste viktige melding"
+
+#: ../mail/e-mail-reader.c:1254
+msgid "Next _Thread"
+msgstr "Neste _tråd"
+
+#: ../mail/e-mail-reader.c:1256
+msgid "Display the next thread"
+msgstr "Vis neste tråd"
+
+#: ../mail/e-mail-reader.c:1261
+msgid "Next _Unread Message"
+msgstr "Neste _uleste melding"
+
+#: ../mail/e-mail-reader.c:1263
+msgid "Display the next unread message"
+msgstr "Vis neste uleste melding"
+
+#: ../mail/e-mail-reader.c:1268
+msgid "_Previous Message"
+msgstr "_Forrige melding"
+
+#: ../mail/e-mail-reader.c:1270
+msgid "Display the previous message"
+msgstr "Vis forrige melding"
+
+#: ../mail/e-mail-reader.c:1275
+msgid "Pr_evious Important Message"
+msgstr "Forrig_e viktige melding"
+
+#: ../mail/e-mail-reader.c:1277
+msgid "Display the previous important message"
+msgstr "Vis forrige viktige melding"
+
+#: ../mail/e-mail-reader.c:1282
+msgid "P_revious Unread Message"
+msgstr "Fo_rrige uleste melding"
+
+#: ../mail/e-mail-reader.c:1284
+msgid "Display the previous unread message"
+msgstr "Vis forrige uleste melding"
+
+#: ../mail/e-mail-reader.c:1291
+msgid "Print this message"
+msgstr "Skriv ut denne meldingen"
+
+#: ../mail/e-mail-reader.c:1298
+msgid "Preview the message to be printed"
+msgstr "Forhåndsvis meldingen som skal skrives ut"
+
+#: ../mail/e-mail-reader.c:1303
+msgid "Re_direct"
+msgstr "Om_diriger"
+
+#: ../mail/e-mail-reader.c:1305
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Omdiriger (bounce) den valgte meldingen til noen"
+
+#: ../mail/e-mail-reader.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "Svar til _alle"
+
+#: ../mail/e-mail-reader.c:1312
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
+
+#: ../mail/e-mail-reader.c:1317
+msgid "Reply to _List"
+msgstr "Svar til _listen"
+
+#: ../mail/e-mail-reader.c:1319
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../mail/e-mail-reader.c:1324
+#: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-msgid "%d attached messages"
-msgstr "%d vedlagte meldinger"
+#: ../mail/e-mail-reader.c:1326
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Vedlegg"
-msgstr[1] "Vedlegg"
+#: ../mail/e-mail-reader.c:1331
+msgid "_Save as mbox..."
+msgstr "Lagre _som mbox..."
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:607
-msgid "Icon View"
-msgstr "Ikonvisning"
+#: ../mail/e-mail-reader.c:1333
+msgid "Save selected messages as an mbox file"
+msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:608
-msgid "List View"
-msgstr "Listevisning"
+#: ../mail/e-mail-reader.c:1338
+msgid "Search Folder from Mailing _List..."
+msgstr "Søkemappe på e-post_liste..."
+
+#: ../mail/e-mail-reader.c:1340
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "Lag en søkemappe for denne e-postlisten"
+
+#: ../mail/e-mail-reader.c:1345
+msgid "Search Folder from Recipien_ts..."
+msgstr "Søkemappe fra mo_ttakere..."
+
+#: ../mail/e-mail-reader.c:1347
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "Lag en søkemappe for disse mottakerene"
+
+#: ../mail/e-mail-reader.c:1352
+msgid "Search Folder from Sen_der..."
+msgstr "Søkemappe for avsen_der..."
+
+#: ../mail/e-mail-reader.c:1354
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "Lag en søkemappe for denne avsenderen"
+
+#: ../mail/e-mail-reader.c:1359
+msgid "Search Folder from S_ubject..."
+msgstr "Søkemappe for _emne..."
+
+#: ../mail/e-mail-reader.c:1361
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "Lag en søkemappe for dette emnet"
+
+#: ../mail/e-mail-reader.c:1366
+msgid "Select _All Text"
+msgstr "Marker _all tekst"
+
+#: ../mail/e-mail-reader.c:1368
+msgid "Select all the text in a message"
+msgstr "Marker all tekst i meldingen"
+
+#: ../mail/e-mail-reader.c:1373
+msgid "_Message Source"
+msgstr "_Meldingskilde"
+
+#: ../mail/e-mail-reader.c:1375
+msgid "Show the raw email source of the message"
+msgstr "Vis e-post meldingen i sin råe form"
+
+#: ../mail/e-mail-reader.c:1387
+msgid "_Undelete Message"
+msgstr "_Angre sletting av melding"
+
+#: ../mail/e-mail-reader.c:1389
+msgid "Undelete the selected messages"
+msgstr "Angre sletting av valgte meldinger"
+
+#: ../mail/e-mail-reader.c:1394
+msgid "_Normal Size"
+msgstr "_Normal størrelse"
+
+#: ../mail/e-mail-reader.c:1396
+msgid "Reset the text to its original size"
+msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
+
+#: ../mail/e-mail-reader.c:1401
+msgid "_Zoom In"
+msgstr "_Zoom inn"
+
+#: ../mail/e-mail-reader.c:1403
+msgid "Increase the text size"
+msgstr "Større tekst"
+
+#: ../mail/e-mail-reader.c:1408
+msgid "Zoom _Out"
+msgstr "Zoom _ut"
+
+#: ../mail/e-mail-reader.c:1410
+msgid "Decrease the text size"
+msgstr "Mindre skrift"
+
+#: ../mail/e-mail-reader.c:1417
+msgid "Create R_ule"
+msgstr "Opprett _regel"
+
+#: ../mail/e-mail-reader.c:1424
+msgid "Ch_aracter Encoding"
+msgstr "Tegn_koding"
+
+#: ../mail/e-mail-reader.c:1431
+msgid "F_orward As"
+msgstr "Videresend s_om"
+
+#: ../mail/e-mail-reader.c:1438
+msgid "_Go To"
+msgstr "_GÃ¥ til"
+
+#: ../mail/e-mail-reader.c:1445
+msgid "Mar_k As"
+msgstr "Mer_k som"
+
+#: ../mail/e-mail-reader.c:1452
+msgid "_Message"
+msgstr "_Melding"
+
+#: ../mail/e-mail-reader.c:1459
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../mail/e-mail-reader.c:1476
+msgid "Mark for Follo_w Up..."
+msgstr "Merk for oppføl_ging..."
+
+#: ../mail/e-mail-reader.c:1484
+msgid "Mark as _Important"
+msgstr "Merk som v_iktig"
+
+#: ../mail/e-mail-reader.c:1488
+msgid "Mark as _Junk"
+msgstr "Merk som _uønsket e-post"
+
+#: ../mail/e-mail-reader.c:1492
+msgid "Mark as _Not Junk"
+msgstr "Merk som _gyldig melding"
+
+#: ../mail/e-mail-reader.c:1496
+msgid "Mar_k as Read"
+msgstr "Mer_k som lest"
+
+#: ../mail/e-mail-reader.c:1500
+msgid "Mark as Uni_mportant"
+msgstr "_Merk som uviktig"
+
+#: ../mail/e-mail-reader.c:1504
+msgid "Mark as _Unread"
+msgstr "Merk som _ulest"
+
+#: ../mail/e-mail-reader.c:1540
+msgid "_Caret Mode"
+msgstr "Markør_modus"
+
+#: ../mail/e-mail-reader.c:1542
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
+
+#: ../mail/e-mail-reader.c:1548
+msgid "All Message _Headers"
+msgstr "Alle meldings_hoder"
+
+#: ../mail/e-mail-reader.c:1550
+msgid "Show messages with all email headers"
+msgstr "Vis meldinger med alle meldingshoder"
+
+#: ../mail/e-mail-reader.c:1762
+msgid "Unable to retrieve message"
+msgstr "Kunne ikke hente ut melding"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:1900
+#: ../plugins/google-account-setup/google-source.c:302
+#: ../plugins/google-account-setup/google-source.c:592
+#: ../plugins/google-account-setup/google-source.c:763
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "Forvalgt"
+
+#: ../mail/e-mail-reader.c:2035 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../modules/calendar/e-memo-shell-view-actions.c:927
+#: ../modules/calendar/e-task-shell-view-actions.c:1127
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Delete"
+msgstr "Slett"
+
+#: ../mail/e-mail-reader.c:2039
+#: ../modules/calendar/e-cal-shell-view-actions.c:1211
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "Neste"
+
+#: ../mail/e-mail-reader.c:2043
+#: ../modules/calendar/e-cal-shell-view-actions.c:1204
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../mail/e-mail-reader.c:2047 ../mail/message-tag-followup.c:62
+msgid "Reply"
+msgstr "Svar"
 
 #: ../mail/e-mail-search-bar.c:76
 #, c-format
@@ -10590,32 +9871,50 @@ msgstr "NÃ¥dde bunnen av siden. Fortsatte fra toppen"
 msgid "Reached top of page, continued from bottom"
 msgstr "NÃ¥dde toppen av siden. Fortsatte fra bunnen"
 
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:220
+#: ../mail/message-list.c:1598
+#: ../modules/addressbook/e-book-shell-backend.c:124
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:141
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:119
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:121
+#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/mail/e-mail-shell-migrate.c:2931
+msgid "On This Computer"
+msgstr "PÃ¥ denne datamaskinen"
+
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:309
+#: ../mail/em-account-editor.c:486
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:313
+#: ../mail/em-account-editor.c:490
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:317
+#: ../mail/em-account-editor.c:494
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:587
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid ""
 "\n"
@@ -10628,122 +9927,154 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "Velg mappe"
-
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:1002
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:1003
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:1004
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
+#: ../mail/em-account-editor.c:2084
+msgid "Mail Configuration"
+msgstr "E-post-konfigurasjon"
+
+#: ../mail/em-account-editor.c:2085
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Velkommen til assistenten for konfigurasjon av Evolution e-post.\n"
+"\n"
+"Klikk «Framover» for å begynne."
+
+#: ../mail/em-account-editor.c:2087 ../mail/em-account-editor.c:2213
+#: ../mail/mail-config.glade.h:87
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2088
+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 "
+"information in email you send."
+msgstr ""
+"Vennligst skriv inn navn og e-post adresse under. De «valgfrie» feltene under "
+"må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
+"informasjonen i meldingene du sender."
+
+#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2254
+#: ../mail/mail-config.glade.h:107
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2200
+#: ../mail/em-account-editor.c:2091
+msgid "Please configure the following account settings."
+msgstr "Vennligst konfigurer følgende kontoinnstillinger."
+
+#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2714
+msgid "Sending Email"
+msgstr "Utgående e-post"
+
+#: ../mail/em-account-editor.c:2094
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+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/em-account-editor.c:2096
+msgid "Account Management"
+msgstr "HÃ¥ndtering av konti"
+
+#: ../mail/em-account-editor.c:2097
+#, fuzzy
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Vennligst oppgi et beskrivende navn for denne kontoen i feltet under. Dette "
+"navnet vil kun bli brukt som et visningsnavn."
+
+#: ../mail/em-account-editor.c:2101
+msgid "Done"
+msgstr "Ferdig"
+
+#: ../mail/em-account-editor.c:2102
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
+"\n"
+"Du kan nå sende og motta e-post \n"
+"med Evolution.\n"
+"\n"
+"Klikk «Bruk» for å lagre dine innstillinger."
+
+#: ../mail/em-account-editor.c:2526
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2208
+#: ../mail/em-account-editor.c:2534
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "Utgående e-post"
-
-#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2776 ../mail/mail-config.glade.h:63
 msgid "Defaults"
 msgstr "Forvalg"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:113
 #: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
+#: ../mail/em-account-editor.c:2879 ../mail/em-account-editor.c:2947
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
+#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3407 ../mail/mail-config.glade.h:35
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3407
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[Forvalg]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "Kontonavn"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
-msgid "Unnamed"
-msgstr "Uten navn"
-
-#: ../mail/em-composer-prefs.c:961
-msgid "Language(s)"
-msgstr "Språk"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "Legg til signaturskript"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "Signatur(er)"
-
-#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "---------Videresendt melding-------"
-
-#: ../mail/em-composer-utils.c:1585
+#: ../mail/em-composer-utils.c:1590
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen måladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/em-composer-utils.c:1591
+#: ../mail/em-composer-utils.c:1596
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto å bruke. Videresending av meldingen ble avbrutt."
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2063
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2110
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10751,11 +10082,19 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2253
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-filter-editor.c:172
+#: ../mail/em-composer-utils.c:2429
+msgid "Posting destination"
+msgstr "Destinasjon for post"
+
+#: ../mail/em-composer-utils.c:2430
+msgid "Choose folders to post the message to."
+msgstr "Velg mapper meldingen skal postes til."
+
+#: ../mail/em-filter-editor.c:188
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
@@ -10772,10 +10111,18 @@ msgstr "Tilegn farge"
 msgid "Assign Score"
 msgstr "Gi poeng"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Bcc"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Pip"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Fullført"
@@ -10792,14 +10139,6 @@ msgstr "Dato mottatt"
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Slett"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Slettet"
@@ -10848,7 +10187,7 @@ msgstr "Følg opp"
 msgid "Forward to"
 msgstr "Videresend til"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
+#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:955
 msgid "Important"
 msgstr "Viktig"
 
@@ -10876,8 +10215,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:88
 msgid "Junk"
 msgstr "Uønsket e-post"
 
@@ -11006,14 +10344,6 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
-msgid "Subject"
-msgstr "Emne"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Nullstill status"
@@ -11027,54 +10357,6 @@ msgstr "SÃ¥ etter"
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "Opp_rett søkemappe fra søk..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "Alle meldinger"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "Uleste meldinger"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "Ingen etikett"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "Leste meldinger"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "Nye meldinger"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "Meldinger fra de siste 5 dagene"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "Meldinger med vedlegg"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "Viktige meldinger"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "Meldinger som ikke er uønsket e-post"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "Søk i konto"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "Søk i alle kontoer"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11100,356 +10382,142 @@ msgstr "Bruk av kvote (%s):"
 msgid "Quota usage"
 msgstr "Bruk av kvote"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
-#: ../mail/mail-component.c:608
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Innboks"
-
-#: ../mail/em-folder-properties.c:390
+#: ../mail/em-folder-properties.c:399
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:256
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:260
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:972 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Søkemapper"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "Skisser"
-
-#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Maler"
-
-#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "Utboks"
-
-#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "Sendt"
-
-#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:662 ../mail/em-folder-tree-model.c:998
 msgid "Loading..."
 msgstr "Laster..."
 
+#: ../mail/em-folder-tree.c:184 ../mail/mail-ops.c:1069
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Skanner mapper i «%s»"
+
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
 #. *
-#. * Most languages should translate this as "%s (%u%s)". The
+#. * Most languages should translate this as "%s (%u)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:318
+#: ../mail/em-folder-tree.c:821
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u%s)"
-msgstr "%s (%u%s)"
+msgid "%s (%u)"
+msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1144
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1311
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1313
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1320 ../mail/message-list.c:2101
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1322 ../mail/message-list.c:2103
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1337
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "_Kopier til mappe"
-
-#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "_Flytt til mappe"
-
-#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
-msgid "_Move"
-msgstr "_Flytt"
-
-#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
-msgid "Cancel _Drag"
-msgstr "Avbryt _draoperasjon"
-
-#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Skanner mapper i «%s»"
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Open in _New Window"
-msgstr "Ã?pne i _nytt vindu"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "_Ny mappe..."
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "_Flytt..."
-
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "O_ppdater"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "T_øm utboks"
-
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "_Tøm papirkurven"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "Søkemappe for _uleste meldinger"
-
-#: ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/em-folder-utils.c:370
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "K_opier"
+#: ../mail/em-folder-utils.c:462
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Endre navn på mappen «%s» til:"
 
-#: ../mail/em-folder-utils.c:537
+#: ../mail/em-folder-utils.c:464
+msgid "Rename Folder"
+msgstr "Gi nytt navn på mappe"
+
+#: ../mail/em-folder-utils.c:470
+msgid "Folder names cannot contain '/'"
+msgstr "Mappenavn kan ikke inneholde tegnet «/»"
+
+#: ../mail/em-folder-utils.c:546
 #: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
-msgstr "Opprett mappe"
+#: ../mail/em-folder-utils.c:706
+msgid "Create Folder"
+msgstr "Lag mappe"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:706
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:386
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "Sletting av e-post feilet"
-
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
-
-#. 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:1335 ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "R_ediger som ny melding..."
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "A_ngre slett"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "Fl_ytt til mappe..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "K_opier til mappe..."
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "Mer_k som lest"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "Merk som _ulest"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "Merk som v_iktig"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "Merk som uv_iktig"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "Merk som _uønsket e-post"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "Merk som _gyldig melding"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "Merk for oppføl_ging..."
-
-#: ../mail/em-folder-view.c:1354
-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:1355 ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "I_ngen"
-
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "_Ny etikett"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "Mer_k som fullført"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "Fj_ern flagg"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Crea_te Rule From Message"
-msgstr "Oppre_tt regel fra melding"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on _Subject"
-msgstr "Søkemappe ba_sert på emne"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "Søkemappe basert på se_nder"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "Søkemappe basert på mottake_re"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Mailing _List"
-msgstr "Søkemappe basert på e-post_liste"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on Sub_ject"
-msgstr "Filter basert på em_ne"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "Filter basert på sen_der"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "Filter basert på motta_kere"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "Filter basert på e-_postliste"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:593
-#: ../plugins/google-account-setup/google-source.c:764
-msgid "Default"
-msgstr "Forvalgt"
-
-#: ../mail/em-folder-view.c:2493
-msgid "Unable to retrieve message"
-msgstr "Kunne ikke hente ut melding"
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "Opprett _søkemappe"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "_Fra denne adressen"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "_Til denne adressen"
-
-#: ../mail/em-folder-view.c:3191
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klikk for å sende melding til %s"
-
-#: ../mail/em-folder-view.c:3203
+#: ../mail/em-folder-utils.c:728
 #, c-format
-msgid "Click to call %s"
-msgstr "Klikk for å ringe %s"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "Klikk for å skjule/vise adresser"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1453
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html-display.c:108
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11457,11 +10525,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1454
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html-display.c:109
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11469,11 +10537,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1455
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html-display.c:110
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11481,11 +10549,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:111 ../mail/em-format-html.c:1456
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html-display.c:111
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11493,11 +10561,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:112 ../mail/em-format-html.c:1457
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
-#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html-display.c:112
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11505,11 +10573,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhørende offentlig nøkkel."
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:119 ../mail/em-format-html.c:1463
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:119
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11517,11 +10585,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:120 ../mail/em-format-html.c:1464
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:120
 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 "
@@ -11531,11 +10599,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:573 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:121 ../mail/em-format-html.c:1465
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:121
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11543,11 +10611,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:574 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:122 ../mail/em-format-html.c:1466
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:122
 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 "
@@ -11556,449 +10624,151 @@ 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:675 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:274
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:525
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution kan ikke rendre denne e-posten da den er for stor. Du kan vise den "
+"uformattert eller åpne den i et eksternt redigeringsprogram."
+
+#: ../mail/em-format-html-display.c:795
 msgid "Completed on"
 msgstr "Fullført"
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:803
 msgid "Overdue:"
 msgstr "Utgått:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:807
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:1071
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "_Vis i meldingsteksten"
-
-#: ../mail/em-format-html-display.c:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "_Skjul"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "_Tilpass bredde"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "Vis _opprinnelig størrelse"
-
-#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:1204 ../mail/em-format-html-display.c:1243
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:1206
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1263
 msgid "O_pen With"
 msgstr "Ã?_pne med"
 
-#: ../mail/em-format-html-display.c:1711
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution kan ikke rendre denne e-posten da den er for stor. Du kan vise den "
-"uformattert eller åpne den i et eksternt redigeringsprogram."
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "Formatterer melding"
+
+#: ../mail/em-format-html.c:342
+msgid "Formatting Message..."
+msgstr "Formatterer melding..."
+
+#: ../mail/em-format-html.c:1304 ../mail/em-format-html.c:1313
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1759
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1767
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1797
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1808
 #, 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:980
+#: ../mail/em-format-html.c:1810
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1831
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1842
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "Formatterer melding"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "Formatterer melding..."
-
-#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "E-postprogram"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:2483
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Denne meldingen ble sendt av <b>%s</b> på vegne av <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
-#: ../widgets/misc/e-dateedit.c:338
-msgid "Date"
-msgstr "Dato"
-
-#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "Nyhetsgrupper"
-
-#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "Ansikt"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s-vedlegg"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
-
-#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "Kunne ikke lese PGP/MIME-melding"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "Ustøttet signaturformat"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "Feil under verifisering av signatur"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
-msgid "Unknown error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message"
-msgstr "Kunne ikke lese PGP-melding"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Kunne ikke lese PGP-melding: Ukjent feil"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "Hver gang"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "En gang om dagen"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "En gang i uken"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "En gang i måneden"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "Legg til egendefinert meldingshoder for uønsket e-post"
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "Navn på meldingshode:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "Verdi i meldingshode inneholder:"
-
-#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Topptekst"
-
-#: ../mail/em-mailer-prefs.c:442
-msgid "Contains Value"
-msgstr "Inneholder verdi"
-
-#: ../mail/em-mailer-prefs.c:465
-msgid "Color"
-msgstr "Farge"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "Tagg"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "Tillegg %s er tilgjengelig og filen er installert."
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
-
-#: ../mail/em-mailer-prefs.c:1092
-msgid "No Junk plugin available"
-msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
-
-#: ../mail/em-mailer-prefs.c:1455
-msgid "Date header:"
-msgstr "Datohode:"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "Oppgaver"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "Senere"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "Flytting"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Kan ikke opprette ny mappe «%s»: %s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
-
-#: ../mail/em-migrate.c:1784
-#, 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:1789
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
-"x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#: ../mail/em-migrate.c:1990
-#, 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:2004
-#, 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:2033
-#, 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:2504 ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "Flytter mapper"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Sammendragsformat for Evolutions e-postmapper bruker sqlite fra Evolution "
-"2.24.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
-
-#: ../mail/em-migrate.c:2955
-#, 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:2974
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
-"config.xmldb» er korrupt eller ser ikke ut til å eksistere."
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "Lagre som..."
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "bilde_uten_navn.%s"
-
-#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "Sett som _bakgrunn"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "Sva_r til avsender"
-
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "Svar til _listen"
-
-#. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "Legg til i _adressebok"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "Ã?pne i %s..."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:607
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dette lageret støtter ikke abonnering, eller så er dette ikke aktivert."
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:860
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:896
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "Ikke vis _denne meldingen igjen."
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:307
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:359
 msgid "message"
 msgstr "melding"
 
-#: ../mail/em-utils.c:652
+#: ../mail/em-utils.c:647
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:697
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:1198
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "Søke_mapper"
 
@@ -12007,62 +10777,92 @@ msgid "Search Folder source"
 msgstr "Kilde for søke_mappe"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Filter Editor\" window height"
+msgstr "Forvalgt vinduhøyde"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+#, fuzzy
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Maksimeringstilstand for «Send & motta e-post»-vindu"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Filter Editor\" window width"
+msgstr "Forvalgt vindubredde"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "\"Search Folder Editor\" window height"
+msgstr "Forvalgt vinduhøyde"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Maksimeringstilstand for «Send & motta e-post»-vindu"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+msgid "\"Search Folder Editor\" window width"
+msgstr "Søkemappe basert på e-post_liste"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "Høyde på vindu for «Send & motta e-post»"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Maksimeringstilstand for «Send & motta e-post»-vindu"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Bredde på «Send & motta e-post»-vindu"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Lar evolution vise tekstdel av begrenset størrelse"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "Forvalgt bredde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "Katalog for å laste/legge ved vedlegg i redigeringsprogrammet"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12070,17 +10870,17 @@ msgstr ""
 "Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12088,59 +10888,66 @@ msgstr ""
 "Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
 "Formatet for listeelementene er «headername=value»."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "Forvalgt høyde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "Forvalgt høyde for meldingsvinduet."
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid "Default height of the mail browser window."
+msgstr "Forvalgt høyde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "Forvalgt høyde for dialog for abonnering."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+msgid "Default maximized state of the mail browser window."
+msgstr "Forvalgt bredde for redigeringsvinduet."
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "Forvalgt bredde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "Forvalgt bredde for meldingsvinduet."
+#: ../mail/evolution-mail.schemas.in.h:38
+#, fuzzy
+msgid "Default width of the mail browser window."
+msgstr "Forvalgt bredde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "Forvalgt bredde for abonneringsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -12148,11 +10955,11 @@ msgstr ""
 "Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
 "lokale adressebøker"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12164,13 +10971,13 @@ msgstr ""
 "som er merket for automatisk fullføring. Operasjonen kan være treg hvils "
 "eksterne adressebøker som LDAP er merket for automatisk fullføring."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bestemmer om egendefinerte meldingshoder skal brukes for å se etter uønsket "
 "e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12180,7 +10987,7 @@ msgstr ""
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12188,76 +10995,76 @@ msgstr ""
 "Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
 "«Meldinger»-kolonnen i vertikal visning."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for å laste/legge ved filer i redigering av ny e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Empty Junk folders on exit"
 msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 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.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Slå av/på spørring ved merking av flere meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable search folders"
 msgstr "Aktiver søkemapper"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders on startup."
 msgstr "Aktiver søkemapper ved oppstart."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12265,19 +11072,19 @@ msgstr ""
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable to render message text part of limited size."
 msgstr "Vis tekstdel av melding med begrenset størrelse."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:65 ../mail/mail-config.glade.h:74
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -12285,19 +11092,19 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Height of the message-list pane"
 msgstr "Høyde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skjuler per-mappe forhåndsvisning og fjerner utvalget"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12305,15 +11112,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.h:64
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Vis forhåndsvisningsområdet ved siden av meldingslisten i stedet for "
-"vertikalt hvis det er aktivt."
-
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:71
 #, fuzzy
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
@@ -12321,13 +11120,41 @@ msgid ""
 "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.h:66
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12336,13 +11163,25 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12350,7 +11189,7 @@ msgstr ""
 "Aktiver/deaktiver funksjonen hvor gjentatte spørsmål stilles om frakoblet "
 "synkronisering kreves."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12360,31 +11199,36 @@ msgstr ""
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "Sist gang mapper for uønsket e-post ble tømt"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "Sist gang papirkurven ble tømt"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+msgid "Layout style"
+msgstr "Utf_orming"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 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.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12393,15 +11237,15 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 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.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:94
 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."
@@ -12410,15 +11254,15 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger og HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:97
 #, fuzzy
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
@@ -12429,109 +11273,115 @@ msgstr ""
 "last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - Alltid "
 "last bilder fra nettet."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+msgid "Mail browser height"
+msgstr "Enhetlig høyde på rad"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+msgid "Mail browser width"
+msgstr "E-post begynner med"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten «Forhåndsvisning»"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "Forvalgt høyde på meldingsvinduet"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "Forvalgt bredde på meldingsvinduet"
-
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tømming av mapper for uønsket e-post ved "
 "avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 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.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
 "avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 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.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 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.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 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.h:103
+#: ../mail/evolution-mail.schemas.in.h:117
 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.h:104
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Spør om bruker ønsker å gå til frakoblet modus med en gang"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Spør ved sletting av meldinger fra søkemappe"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:122
 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.h:109
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12539,208 +11389,234 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "Ã¥ motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:124
 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.h:111
+#: ../mail/evolution-mail.schemas.in.h:125
 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.h:112
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:128
 #, fuzzy
 msgid "Put the cursor at the bottom of replies"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uønsket."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Søk etter bilde av avsender i lokale adressebøker"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:143
 #, fuzzy
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Show all message headers"
+msgstr "Slå sammen alle meldingstråder"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+msgid "Show all the headers when viewing a messages."
+msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Show the \"Preview\" pane"
+msgstr "Vis forhåndsvisningsvinduet"
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"Preview\" pane."
+msgstr "Vis forhåndsvisningsvinduet."
+
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis avsenders e-postadresse i en egen kolonne i meldingslisten."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 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:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "Språk for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt høyde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "Grense for tekstdel av melding"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Sist gang mapper for uønsket e-post ble tømt i dager siden epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 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.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12748,7 +11624,7 @@ msgstr ""
 "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
 "feilsøkingsmeldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:176
 #, fuzzy
 msgid ""
 "This decides the max size of the text part that can be formatted under "
@@ -12757,7 +11633,7 @@ 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.h:160
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12767,7 +11643,7 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -12776,7 +11652,7 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
 "den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:179
 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;"
@@ -12788,18 +11664,18 @@ msgstr ""
 "&lt;header enabled&gt; - sett «enabled» hvis toppteksten skal vises i e-"
 "postvisningen. "
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "Dette valget vil øke hastigheten ved henting."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12807,7 +11683,7 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «...»."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12815,7 +11691,7 @@ msgstr ""
 "Denne innstillingen spesifiserer om tråder skal være i utvidet eller "
 "sammenslått tilstand som forvalg. Evolution må startes på nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12825,92 +11701,88 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message list."
 msgstr "Bruk meldingsliste med tråder."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Thread the message-list"
 msgstr "Bruk meldingsliste med tråder"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message-list based on Subject"
 msgstr "Lag tråder av e-postlisten basert på emne"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgrense for å merke e-post som sett"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Timeout for marking message as seen."
 msgstr "Tidsavbrydd å merke e-poster som sett."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:197
 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.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "Bruk side-ved-side eller bred utforming"
-
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Om en forespørsel om lesekvittering skal legges til alle meldinger som "
 "forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:202
 #, fuzzy
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Slå av eller på bruk av ellipse for mappenavn i mappetreet"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12918,15 +11790,15 @@ msgstr ""
 "Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Om tråder sorteres basert på siste melding i den tråden"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
@@ -12934,6 +11806,12 @@ msgstr "Bredde på e-postlistefeltet."
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../modules/mail/e-mail-shell-view.c:215
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "E-post"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
@@ -12942,37 +11820,37 @@ msgstr "Import fra Elm for Evolution"
 msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "MÃ¥lmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:131
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:215
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:526
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:358
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
@@ -12981,6 +11859,11 @@ msgstr "Søker i %s"
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
+#: ../mail/importers/pine-importer.c:383
+#: ../modules/addressbook/addressbook-config.c:1016
+msgid "Address Book"
+msgstr "Adressebok"
+
 #: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
@@ -12989,22 +11872,22 @@ msgstr "Import fra Pine for Evolutions"
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:257
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:292
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
@@ -13013,250 +11896,161 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d valgt, "
-msgstr[1] "%d valgt, "
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d slettet"
-msgstr[1] "%d slettet"
-
-#: ../mail/mail-component.c:584
-#, 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:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d skisse"
-msgstr[1] "%d skisser"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d sendt"
-msgstr[1] "%d sendt"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d usendt"
-msgstr[1] "%d usendte"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d ulest, "
-msgstr[1] "%d uleste, "
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d totalt"
-msgstr[1] "%d totalt"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "Ny e-post melding"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "E-post_melding"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "Skriv en ny e-postmelding"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "Ny e-postmappe"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "E-post_mappe"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "Opprett en ny e-postmappe"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
-
 #: ../mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types"
+msgstr "Sj_ekk støttede typer"
+
+#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(NB! Krever omstart av programmet)"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:4
 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
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Bilde av avsender</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sig_naturer</b> "
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Alternativ for topp-posting</b> (Ikke anbefalt)"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>S_pråk</b> "
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentisering</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Skriving av meldinger</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigurasjon</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Forvalgt oppførsel</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Sletting av e-post</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Meldings_hoder som vises</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels</span>"
 msgstr "<span weight=\"bold\">Etiketter</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Lasting av bilder</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Meldingsvisning</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Kvitteringer for meldinger</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 #: ../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:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativer</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 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:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Proxy Settings</span>"
 msgstr "<span weight=\"bold\">Innstillinger for proxy</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">_Autentiseringstype</span>"
 
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "HÃ¥ndtering av konti"
-
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
 #: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "Legg til _skript"
-
-#: ../mail/mail-config.glade.h:38
 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:39
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 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:43
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:44
 msgid ""
 "Attachment\n"
 "Inline\n"
@@ -13266,7 +12060,7 @@ msgstr ""
 "I meldingen\n"
 "Sitert"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
 msgid ""
 "Attachment\n"
 "Inline (Outlook style)\n"
@@ -13278,369 +12072,285 @@ msgstr ""
 "Sitert\n"
 "Ikke siter"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:51
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltisk (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltisk (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:52
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:53
 #: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:54
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:55
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende e-post er uønsket"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.glade.h:58
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.glade.h:59
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.glade.h:60
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:61
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.glade.h:65
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
-"\n"
-"Du kan nå sende og motta e-post \n"
-"med Evolution.\n"
-"\n"
-"Klikk «Bruk» for å lagre dine innstillinger."
-
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "_Forvalgt"
-
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:62
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:64
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:66
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:67
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ikke formater meldinger når st_ørrelsen overstiger"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:68
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uønsket hvis avsender finnes i adresseboken"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "Ferdig"
-
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:69
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "E-post kontoer"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:70
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:71
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:72
 msgid "Enable Magic S_pacebar"
 msgstr "Aktiver magi_sk mellomromtast"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:73
 msgid "Enable Sea_rch Folders"
 msgstr "Aktiver søkemappe_r"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:75
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:76
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:77
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:78
 msgid "Fix_ed width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:79
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:80
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:81
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:83
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:84
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:85
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:86
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:101
-msgid ""
-"If the server uses a non-standard port then specify the server address as "
-"\"server-name:port-number\""
-msgstr ""
-"Hvis tjeneren bruker en annen port enn det som er forvalg så må adressen "
-"oppgis som «tjenernavn:port-nummer»"
-
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:89
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:90 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:91
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "E-post-konfigurasjon"
-
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:92
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:93 ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
+
+#: ../mail/mail-config.glade.h:94
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:95
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:96
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.glade.h:112
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"Merk: Understrek i etikettnavnet brukes som hurtigtastidentifikator i menyen."
-
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:97
 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:114
+#: ../mail/mail-config.glade.h:98
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uønsket e-post."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:99
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:100
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:101
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please configure the following account settings."
-msgstr "Vennligst konfigurer følgende kontoinnstillinger."
-
-#: ../mail/mail-config.glade.h:120
-msgid ""
-"Please enter a descriptive name for this account in the space below. This "
-"name will be used for display purposes only."
-msgstr ""
-"Vennligst oppgi et beskrivende navn for denne kontoen i feltet under. Dette "
-"navnet vil kun bli brukt som et visningsnavn."
-
-#: ../mail/mail-config.glade.h:121
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-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:122
-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 "
-"information in email you send."
-msgstr ""
-"Vennligst skriv inn navn og e-post adresse under. De «valgfrie» feltene under "
-"må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
-"informasjonen i meldingene du sender."
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:103
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:104
 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:125
+#: ../mail/mail-config.glade.h:105
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:106
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:108
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:109
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Kun søk etter bilde av avs_ender i lokale adressebøker"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:110
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:111
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:112
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:114
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:115
 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:136
+#: ../mail/mail-config.glade.h:116
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:117
 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:139
+#: ../mail/mail-config.glade.h:118
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:119
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:120
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:121
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:122
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:123
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:124
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "Tabell med signaturer"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:126
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:127
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:128
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13648,15 +12358,17 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 "Utdata fra dette skriptet vil brukes som din\n"
 "signatur. Navnet du oppgir vil kun brukes for visning på skjermen."
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:132
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13664,153 +12376,149 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:134
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:135
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:681
+#: ../mail/mail-config.glade.h:136 ../plugins/caldav/caldav-source.c:405
 #: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:680
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:137
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:159
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Velkommen til assistenten for konfigurasjon av Evolution e-post.\n"
-"\n"
-"Klikk «Framover» for å begynne."
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:139
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:140
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:141
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:142
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:143
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:144
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:145
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:146
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:147
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:148
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:149
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:151
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:152
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:153
 msgid "_Prompt on sending HTML mail 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:179
+#: ../mail/mail-config.glade.h:154
 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:180
+#: ../mail/mail-config.glade.h:155
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:156
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:157
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:158
 msgid "_Select..."
 msgstr "_Velg..."
 
+#: ../mail/mail-config.glade.h:159
+#: ../modules/addressbook/ldap-config.glade.h:39
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Server:"
+msgstr "Tj_ener:"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:161
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:162
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:163
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:164
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:165
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:166
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:169
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:170
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:171
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:172
 msgid "seconds"
 msgstr " sekunder"
 
@@ -13894,26 +12602,26 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:872
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:110
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:269
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../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:574 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:605
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13922,123 +12630,123 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:622
 #, 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:724 ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:730 ../mail/mail-ops.c:811
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:740
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:767
 #, 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:701
+#: ../mail/mail-ops.c:769 ../mail/mail-send-recv.c:717
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:771 ../mail/mail-send-recv.c:719
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:877
+#: ../mail/mail-ops.c:883
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:960
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:960
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1177
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1212
+#: ../mail/mail-ops.c:1218
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ã?pner mappe %s"
 
-#: ../mail/mail-ops.c:1277
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Henter kvoteinformasjon for mappe %s"
 
-#: ../mail/mail-ops.c:1346
+#: ../mail/mail-ops.c:1356
 #, c-format
 msgid "Opening store %s"
 msgstr "Ã?pner lager %s"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1545
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1608
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1653
+#: ../mail/mail-ops.c:1663
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1703 ../mail/mail-ops.c:1753
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1750
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1751
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1822
+#: ../mail/mail-ops.c:1832
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1941
 #, 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:2016
+#: ../mail/mail-ops.c:2026
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2106
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14047,11 +12755,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2178
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2196 ../mail/mail-ops.c:2204
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14060,134 +12768,122 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2460
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2546
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:186
 msgid "Canceling..."
 msgstr "Avbryter..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:392
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:405
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:514
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:514 ../mail/mail-send-recv.c:591
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:830
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:212
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:215
+#: ../mail/mail-session.c:217
 #: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:219
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:261
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "L_agre og lukk"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "Rediger signatur"
-
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "Navn på _signatur:"
-
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:122
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:152
 #, 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
+#: ../mail/mail-tools.c:258
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:260
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:300
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkemappe: %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:237
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Oppdaterer søkemapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:244
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkemapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1079
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1169
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
@@ -14505,6 +13201,10 @@ msgstr "Ignorer"
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
+#: ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "Sletting av e-post feilet"
+
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
@@ -14747,6 +13447,10 @@ msgstr ""
 "meldingene fra dine lokale eller eksterne mapper.\n"
 "Vil du virkelig gjøre dette?"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
+
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
@@ -14793,6 +13497,10 @@ msgstr "_Forkast endringene"
 msgid "_Do not Synchronize"
 msgstr "I_kke synkroniser"
 
+#: ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "_Tøm papirkurven"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "T_øm"
@@ -14801,78 +13509,82 @@ msgstr "T_øm"
 msgid "_Open Messages"
 msgstr "_Ã?pne meldinger"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1064
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1065
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1066
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1067
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1068
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1069
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1073
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1074
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1078
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1079
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1753
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1765
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1773
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1775
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
+#: ../mail/message-list.c:2515 ../shell/e-shell-view.c:565
+msgid "Shell Backend"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
+#: ../mail/message-list.c:4103 ../mail/message-list.c:4577
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4414
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14880,7 +13592,7 @@ msgstr ""
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4416
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -14888,7 +13600,7 @@ msgstr ""
 "Det finnes kun skjulte meldinger i denne mappen. Bruk Vis->Vis skjulte "
 "meldinger for å vise dem."
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4418
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -14942,7 +13654,7 @@ msgstr "Følg opp"
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58
 msgid "Forward"
 msgstr "Videresend"
 
@@ -14950,11 +13662,7 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "Svar"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
+#: ../mail/message-tag-followup.c:63
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -14963,37 +13671,2295 @@ msgid "Review"
 msgstr "Gjennomgå"
 
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1428
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "Emne eller adresser inneholder"
-
-#: ../mail/searchtypes.xml.h:7
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "Subject or Recipients contains"
 msgstr "Emne eller mottakere inneholder"
 
-#: ../mail/searchtypes.xml.h:8
+#: ../mail/searchtypes.xml.h:7
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
 msgid "Subject or Sender contains"
 msgstr "Emne eller avsender inneholder"
 
+#: ../modules/addressbook/addressbook-config.c:212
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Hvis du velger dette alternativet vil Evolution kun koble til din LDAP-"
+"tjener hvis denne støtter SSL."
+
+#: ../modules/addressbook/addressbook-config.c:214
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Hvis du velger dette alternativet vil Evolution kun koble til din LDAP-"
+"tjener hvis denne støtter TLS."
+
+#: ../modules/addressbook/addressbook-config.c:216
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Hvis du velger dette alternativet betyr det at din tjener ikke støtter SSL "
+"eller TLS. Dette betyr at din tilkobling vil være usikker, og at du vil være "
+"sårbar for sikkerhetshull. "
+
+#: ../modules/addressbook/addressbook-config.c:341
+msgid "Base"
+msgstr "Basis"
+
+#: ../modules/addressbook/addressbook-config.c:643
+msgid "Copy _book content locally for offline operation"
+msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
+
+#: ../modules/addressbook/addressbook-config.c:754
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Dette er porten på LDAP-tjeneren som Evolution vil prøve å koble til. En "
+"liste med standardporter er gitt. Spør din systemadministrator hvilken port "
+"du skal bruke."
+
+#: ../modules/addressbook/addressbook-config.c:832
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
+"setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
+
+#: ../modules/addressbook/addressbook-config.c:911
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"Søkeområdet definerer hvor dypt du ønsker at søket skal gå ned i "
+"katalogtreet. Et søkeområde som «sub» vil ta med alle oppføringer under din "
+"søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
+"basen."
+
+#: ../modules/addressbook/addressbook-config.c:1020
+msgid "Server Information"
+msgstr "Tjenerinformasjon"
+
+#: ../modules/addressbook/addressbook-config.c:1022
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: ../modules/addressbook/addressbook-config.c:1025
+#: ../modules/addressbook/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Detaljer"
+
+#: ../modules/addressbook/addressbook-config.c:1026
+msgid "Searching"
+msgstr "Søker"
+
+#: ../modules/addressbook/addressbook-config.c:1028
+msgid "Downloading"
+msgstr "Laster ned"
+
+#: ../modules/addressbook/addressbook-config.c:1238
+#: ../modules/addressbook/ldap-config.glade.h:9
+msgid "Address Book Properties"
+msgstr "Egenskaper for adressebok"
+
+#: ../modules/addressbook/addressbook-config.c:1240
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Lengde for autofullføring"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+msgid "Contact layout style"
+msgstr "Kontaktliste"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+msgid "Contact preview pane position (vertical)"
+msgstr "Plassering av vertikalt felt for månedsvisning"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML for listen med URIer for fullføring"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML for listen med URIer for fullføring"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "Vis forhåndsvisningsområdet"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+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."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI for sist brukt mappe i dialogen for å velge navn"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI for sist brukt mappe i dialogen for å velge navn."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "Om forhåndsvisningsområdet skal vises."
+
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Fromat for dato ogklokkeslett"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "Table column:"
+msgstr "Kolonne i tabell:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Autofullføring"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "Alltid vi_s adresse for automatisk fullført kontakt"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:189
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "PÃ¥ LDAP-tjenere"
+
+#: ../modules/addressbook/e-book-shell-backend.c:339
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: ../modules/addressbook/e-book-shell-backend.c:341
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
+msgid "Create a new contact"
+msgstr "Opprett en ny kontakt"
+
+#: ../modules/addressbook/e-book-shell-backend.c:346
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: ../modules/addressbook/e-book-shell-backend.c:348
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
+msgid "Create a new contact list"
+msgstr "Opprett en ny kontaktliste"
+
+#: ../modules/addressbook/e-book-shell-backend.c:356
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Adresse_bok"
+
+#: ../modules/addressbook/e-book-shell-backend.c:358
+#: ../modules/addressbook/e-book-shell-view-actions.c:641
+msgid "Create a new address book"
+msgstr "Opprett en ny adressebok"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:375
+#: ../modules/addressbook/e-book-shell-view.c:272
+#: ../modules/calendar/e-cal-shell-backend.c:239
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: ../modules/addressbook/e-book-shell-backend.c:566
+#: ../modules/calendar/e-cal-shell-backend.c:815
+#: ../modules/calendar/e-memo-shell-backend.c:606
+#: ../modules/calendar/e-task-shell-backend.c:614
+#, fuzzy
+msgid "Source List"
+msgstr "Kilde"
+
+#: ../modules/addressbook/e-book-shell-backend.c:567
+#, fuzzy
+msgid "The registry of address books"
+msgstr "Kunne ikke hente liste med adressebøker"
+
+#: ../modules/addressbook/e-book-shell-content.c:313
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktiv visning"
+
+#: ../modules/addressbook/e-book-shell-content.c:314
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:323
+#, fuzzy
+msgid "Previewed Contact"
+msgstr "Ny kontakt"
+
+#: ../modules/addressbook/e-book-shell-content.c:324
+#, fuzzy
+msgid "The contact being shown in the preview pane"
+msgstr "Om forhåndsvisningsområdet skal vises."
+
+#: ../modules/addressbook/e-book-shell-content.c:333
+#: ../modules/calendar/e-memo-shell-content.c:600
+#: ../modules/calendar/e-task-shell-content.c:623
+#: ../modules/mail/e-mail-shell-content.c:697
+#, fuzzy
+msgid "Preview is Visible"
+msgstr "Sidelinjen er synlig"
+
+#: ../modules/addressbook/e-book-shell-content.c:334
+#: ../modules/calendar/e-memo-shell-content.c:601
+#: ../modules/calendar/e-task-shell-content.c:624
+#: ../modules/mail/e-mail-shell-content.c:698
+#, fuzzy
+msgid "Whether the preview pane is visible"
+msgstr "Om forhåndsvisningsområdet skal vises."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../modules/mail/e-mail-shell-migrate.c:1105
+msgid "Migrating..."
+msgstr "Flytter..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../modules/mail/e-mail-shell-migrate.c:1178
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Flytter «%s»:"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP-tjenere"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "Innstillinger for autofullføring"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Lokasjon og hierarki for kontaktmappene i Evolution er endret siden "
+"Evolution 1.x.\n"
+"\n"
+"Vennligst vent mens Evolution migrerer dine mapper..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Format for kontaktlister er endret.\n"
+"\n"
+"Vennligst vent mens Evolution migrerer dine mapper..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"MÃ¥ten Evolution lagrer noen telefonnumre er endret.\n"
+"\n"
+"Vennligst vent mens Evolution migrerer dine mapper..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Endringslogg og tilordningsfiler for Palm-synkronisering er endret.\n"
+"\n"
+"Vennligst vent mens Evolution migrerer dine mapper..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:173
+#: ../modules/calendar/e-cal-shell-sidebar.c:561
+#: ../modules/calendar/e-memo-shell-sidebar.c:528
+#: ../modules/calendar/e-task-shell-sidebar.c:526
+#, fuzzy
+msgid "Source Selector Widget"
+msgstr "Valgt av notatkilde"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:174
+#, fuzzy
+msgid "This widget displays groups of address books"
+msgstr "Kunne ikke hente liste med adressebøker"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:618
+msgid "Co_py All Contacts To..."
+msgstr "Ko_pier alle kontakter til..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:620
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Kopier kontakter fra valgt mappe til en annen mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:625
+msgid "Del_ete Address Book"
+msgstr "Sl_ett adressebok"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:627
+#, fuzzy
+msgid "Delete the selected address book"
+msgstr "Slett valgt mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:632
+msgid "Mo_ve All Contacts To..."
+msgstr "Fl_ytt alle kontakter til..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:634
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "Flytt kontakter fra valgt mappe til en annen mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:639
+msgid "_New Address Book"
+msgstr "_Ny adressebok"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:646
+msgid "Address _Book Properties"
+msgstr "Egenskaper for adresse_bok"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:648
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "Endre egenskaper for valgt mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-memo-shell-view-actions.c:653
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
+msgid "_Rename..."
+msgstr "End_re navn..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:655
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "Endre navn på valgt mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:660
+#, fuzzy
+msgid "S_ave Address Book as vCard"
+msgstr "L_agre adressebok som VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Lagre kontakter i valgt mappe som VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#, fuzzy
+msgid "Stop loading"
+msgstr "Stopp innlesing"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/calendar/e-cal-shell-view-actions.c:1269
+msgid "Copy the selection"
+msgstr "Kopier utvalget"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/calendar/e-cal-shell-view-actions.c:1276
+msgid "Cut the selection"
+msgstr "Klipp ut utvalget"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/calendar/e-cal-shell-view-actions.c:1283
+msgid "Paste the clipboard"
+msgstr "Lim inn fra utklippstavlen"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:695
+#, fuzzy
+msgid "_Copy Contact To..."
+msgstr "_Kopier kontakt til..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "Kopier valgte kontakter til en annen mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:702
+msgid "_Delete Contact"
+msgstr "_Slett kontakt"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
+msgid "Delete selected contacts"
+msgstr "Slett valgte kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:709
+msgid "_Forward Contact..."
+msgstr "_Videresend kontakt..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:711
+msgid "Send selected contacts to another person"
+msgstr "Send valgte kontakter til en annen person"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:716
+#, fuzzy
+msgid "_Move Contact To..."
+msgstr "_Flytt kontakt til..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#, fuzzy
+msgid "Move selected contacts to another address book"
+msgstr "Flytt valgte kontakter til en annen mappe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:723
+msgid "_New Contact..."
+msgstr "_Ny kontakt..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:730
+msgid "New Contact _List..."
+msgstr "Ny kontakt_liste..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:737
+msgid "_Open"
+msgstr "_Ã?pne"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
+msgid "View the current contact"
+msgstr "Vis aktiv kontakt"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#, fuzzy
+msgid "Save selected contacts as a vCard"
+msgstr "Lagre valgte kontakter som et VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
+msgid "Select all contacts"
+msgstr "Velg alle kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:758
+msgid "_Send Message to Contact..."
+msgstr "_Send melding til kontakt..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
+msgid "Send a message to the selected contacts"
+msgstr "Send en melding til valgte kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-task-shell-view-actions.c:843
+msgid "_Actions"
+msgstr "H_andlinger"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/calendar/e-memo-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:850
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
+msgid "_Preview"
+msgstr "_Forhåndsvis"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-memo-shell-view-actions.c:632
+#: ../modules/calendar/e-task-shell-view-actions.c:757
+msgid "_Delete"
+msgstr "_Slett"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
+msgid "_Properties"
+msgstr "Egenska_per..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:795
+msgid "_Save as vCard..."
+msgstr "Lagre _som vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:843
+msgid "Contact _Preview"
+msgstr "_Forhåndsvisning av kontakt"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:845
+msgid "Show contact preview window"
+msgstr "Vis vindu for forhåndsvisning av kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:864
+#: ../modules/calendar/e-memo-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
+msgid "_Classic View"
+msgstr "_Klassisk visning"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/calendar/e-memo-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
+msgid "_Vertical View"
+msgstr "_Vertikal visning"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:873
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "Vis vindu for forhåndsvisning av kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-task-shell-view-actions.c:972
+msgid "Any Category"
+msgstr "Enhver kategori"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/calendar/e-cal-shell-view-actions.c:1570
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
+msgid "Unmatched"
+msgstr "Ingen treff"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
+msgid "Print selected contacts"
+msgstr "Skriv ut valgte kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:931
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "Forhåndsviser kontaktene som skal skrives ut"
+
+#: ../modules/addressbook/e-book-shell-view.c:216
+msgid "_Forward Contacts"
+msgstr "_Videresend kontakter"
+
+#: ../modules/addressbook/e-book-shell-view.c:218
+msgid "_Forward Contact"
+msgstr "_Videresend kontakt"
+
+#: ../modules/addressbook/e-book-shell-view.c:249
+#, fuzzy
+msgid "_Send Message to Contacts"
+msgstr "Send _melding til kontakter"
+
+#: ../modules/addressbook/e-book-shell-view.c:251
+#, fuzzy
+msgid "_Send Message to List"
+msgstr "Send _melding til liste"
+
+#: ../modules/addressbook/e-book-shell-view.c:253
+#, fuzzy
+msgid "_Send Message to Contact"
+msgstr "Send _melding til kontakt"
+
+#: ../modules/addressbook/eab-composer-util.c:139
+msgid "Multiple vCards"
+msgstr "Flere vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:147
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard for %s"
+
+#: ../modules/addressbook/eab-composer-util.c:159
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information"
+msgstr "Kontaktinformasjon"
+
+#: ../modules/addressbook/eab-composer-util.c:188
+#, c-format
+msgid "Contact information for %s"
+msgstr "Kontaktinformasjon for %s"
+
+#: ../modules/addressbook/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.glade.h:2
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
+
+#: ../modules/addressbook/ldap-config.glade.h:5
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentisering</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>Laster ned</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>Søker</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:10
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Anonymt\n"
+"Bruk e-postadresse\n"
+"Bruk distinguished name (DN)"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.glade.h:14
+msgid "B_rowse this book until limit reached"
+msgstr "B_la gjennom denne boken til grensen nås"
+
+#: ../modules/addressbook/ldap-config.glade.h:16
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren."
+
+#: ../modules/addressbook/ldap-config.glade.h:18
+msgid "Lo_gin:"
+msgstr "Lo_gin"
+
+#: ../modules/addressbook/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"En\n"
+"Undernivå"
+
+#: ../modules/addressbook/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL-kryptering\n"
+"TLS-kryptering\n"
+"Ingen kryptering"
+
+#: ../modules/addressbook/ldap-config.glade.h:24
+msgid "Search Filter"
+msgstr "Søkefilter"
+
+#: ../modules/addressbook/ldap-config.glade.h:25
+msgid "Search _base:"
+msgstr "Søke_base:"
+
+#: ../modules/addressbook/ldap-config.glade.h:26
+msgid "Search _filter:"
+msgstr "Søke_filter:"
+
+#: ../modules/addressbook/ldap-config.glade.h:27
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Søkefilter angir type objekter det skal søkes etter når et søk utføres. Hvis "
+"dette ikke endres vil søket bruke objektklassen «person» som forvalg."
+
+#: ../modules/addressbook/ldap-config.glade.h:28
+msgid "Supported Search Bases"
+msgstr "Støttede søkebaser"
+
+#: ../modules/addressbook/ldap-config.glade.h:29
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"Søkebasen er det distingverte navnet (DN) for oppføringen der dine søk vil "
+"starte. Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
+
+#: ../modules/addressbook/ldap-config.glade.h:30
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Dette er hele navnet på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
+
+#: ../modules/addressbook/ldap-config.glade.h:31
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter "
+"dette tallet for høyt vil adresseboken bli treg."
+
+#: ../modules/addressbook/ldap-config.glade.h:32
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. Det "
+"brukes kun for visning på skjermen."
+
+#: ../modules/addressbook/ldap-config.glade.h:33
+msgid "_Download limit:"
+msgstr "Grense for ne_dlasting:"
+
+#: ../modules/addressbook/ldap-config.glade.h:34
+msgid "_Find Possible Search Bases"
+msgstr "_Finn mulige søkebaser"
+
+#: ../modules/addressbook/ldap-config.glade.h:35
+msgid "_Login method:"
+msgstr "Metode for på_logging:"
+
+#: ../modules/addressbook/ldap-config.glade.h:37
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../modules/addressbook/ldap-config.glade.h:38
+msgid "_Search scope:"
+msgstr "_Søkeområde:"
+
+#: ../modules/addressbook/ldap-config.glade.h:40
+msgid "_Timeout:"
+msgstr "_Tidsavbrudd:"
+
+#: ../modules/addressbook/ldap-config.glade.h:41
+msgid "_Use secure connection:"
+msgstr "Br_uk sikker forbindelse:"
+
+#: ../modules/addressbook/ldap-config.glade.h:42
+msgid "cards"
+msgstr "kort"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "I_mporter"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "Velg en kalender"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "Velg en oppgaveliste"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "I_mporter til kalenderen"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "I_mporter til oppgaver"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:226
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:204
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:206
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "PÃ¥ nettet"
+
+#: ../modules/calendar/e-cal-shell-backend.c:286
+#: ../modules/calendar/e-cal-shell-backend.c:292
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "Fødselsdager og jubileum"
+
+#: ../modules/calendar/e-cal-shell-backend.c:310
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "Vær"
+
+#: ../modules/calendar/e-cal-shell-backend.c:481
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Avtale"
+
+#: ../modules/calendar/e-cal-shell-backend.c:483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
+msgid "Create a new appointment"
+msgstr "Opprett en ny avtale"
+
+#: ../modules/calendar/e-cal-shell-backend.c:488
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Avtale for hele _dagen"
+
+#: ../modules/calendar/e-cal-shell-backend.c:490
+msgid "Create a new all-day appointment"
+msgstr "Opprett en ny avtale for hele dagen"
+
+#: ../modules/calendar/e-cal-shell-backend.c:495
+msgctxt "New"
+msgid "M_eeting"
+msgstr "Møt_e"
+
+#: ../modules/calendar/e-cal-shell-backend.c:497
+msgid "Create a new meeting request"
+msgstr "Opprett en ny møteforespørsel"
+
+#: ../modules/calendar/e-cal-shell-backend.c:505
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Kale_nder"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1234
+msgid "Create a new calendar"
+msgstr "Opprett en ny kalender"
+
+#: ../modules/calendar/e-cal-shell-backend.c:542
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
+
+#: ../modules/calendar/e-cal-shell-backend.c:816
+#, fuzzy
+msgid "The registry of calendars"
+msgstr "Primær kalender"
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Lokasjon og hierarki for Evolutions kalendermapper er endret siden Evolution "
+"1.x.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Kan ikke migrere kalender «%s»"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+#, fuzzy, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Feil på «%s»:\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#, fuzzy
+msgid "Loading calendars"
+msgstr "Laster kalender"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:428
+#, fuzzy
+msgid "Calendar Selector"
+msgstr "Valg av kalenderkilde"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:551
+msgid "Date Navigator Widget"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:552
+msgid "This widget displays a miniature calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:562
+msgid "This widget displays groups of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:723
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Ã?pner kalender"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:240
+msgid "Print"
+msgstr "Skriv ut"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:299
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
+"Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:316
+msgid "Purge events older than"
+msgstr "Slett hendelser eldre enn"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:329
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "dager"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:546
+#, fuzzy
+msgid "Copying Items"
+msgstr "Kopierer oppføringer"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#, fuzzy
+msgid "Moving Items"
+msgstr "Flytter oppføringer"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
+msgid "Save As..."
+msgstr "Lagre som..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1190
+#: ../modules/calendar/e-memo-shell-view-actions.c:625
+msgid "_Copy..."
+msgstr "_Kopier..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1206
+#, fuzzy
+msgid "Go Back"
+msgstr "GÃ¥ tilbake"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1213
+#, fuzzy
+msgid "Go Forward"
+msgstr "GÃ¥ fremover"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1218
+msgid "Select _Today"
+msgstr "Velg i _dag"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+msgid "Select today"
+msgstr "Velg i dag"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1225
+msgid "Select _Date"
+msgstr "Velg _dato"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1227
+msgid "Select a specific date"
+msgstr "Velg en spesifikk dato"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1232
+msgid "_New Calendar"
+msgstr "_Ny kalender"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-task-shell-view-actions.c:827
+msgid "Purg_e"
+msgstr "Fj_ern"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1248
+msgid "Purge old appointments and meetings"
+msgstr "Fjern gamle avtaler og møter"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1255
+#, fuzzy
+msgid "Rename the selected calendar"
+msgstr "Endre navn på valgt mappe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#, fuzzy
+msgid "Show _Only This Calendar"
+msgstr "Vis k_un denne kalenderen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+msgid "Cop_y to Calendar..."
+msgstr "Kop_ier til kalender..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+msgid "_Delegate Meeting..."
+msgstr "_Deleger møte..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
+msgid "Delete the appointment"
+msgstr "Slett avtalen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "Slett denne _hendelsen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+msgid "Delete this occurrence"
+msgstr "Slett denne oppføringen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+msgid "Delete _All Occurrences"
+msgstr "Slett _alle hendelser"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+msgid "Delete all occurrences"
+msgstr "Slett alle oppføringer"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#, fuzzy
+msgid "New All Day _Event..."
+msgstr "Ny avtale som varer h_ele dagen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#, fuzzy
+msgid "Create a new all day event"
+msgstr "Opprett en ny avtale for hele dagen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-memopad.c:301
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:375
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "_Forward as iCalendar..."
+msgstr "_Videresend som iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#, fuzzy
+msgid "New _Meeting..."
+msgstr "Nytt _møte"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#, fuzzy
+msgid "Create a new meeting"
+msgstr "Opprett en ny møteforespørsel"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Mo_ve to Calendar..."
+msgstr "Fl_ytt til kalender..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "New _Appointment..."
+msgstr "Ny _avtale..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+msgid "Make this Occurrence _Movable"
+msgstr "Gjør denne hendelsen _flyttbar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+msgid "_Open Appointment"
+msgstr "_Ã?pne avtale"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+msgid "View the current appointment"
+msgstr "Vis denne avtalen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "_Reply"
+msgstr "Sva_r"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+msgid "_Schedule Meeting..."
+msgstr "_Sett opp møte..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+msgid "Day"
+msgstr "Dag"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+msgid "Show one day"
+msgstr "Vis en dag"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+msgid "List"
+msgstr "Liste"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+msgid "Show as list"
+msgstr "Vis som liste"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+msgid "Month"
+msgstr "MÃ¥ned"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+msgid "Show one month"
+msgstr "Vis en måned"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+msgid "Week"
+msgstr "Uke"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+msgid "Show one week"
+msgstr "Vis en uke"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+msgid "Work Week"
+msgstr "Arbeidsuke"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1541
+#, fuzzy
+msgid "Show one work week"
+msgstr "Vis en uke"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#, fuzzy
+msgid "Active Appointements"
+msgstr "Aktive avtaler"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+msgid "Next 7 Days' Appointments"
+msgstr "Avtaler for de neste 7 dagene"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../modules/calendar/e-task-shell-view-actions.c:1024
+msgid "Description contains"
+msgstr "Beskrivelse inneholder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
+#: ../modules/calendar/e-task-shell-view-actions.c:1031
+msgid "Summary contains"
+msgstr "Sammendrag inneholder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1606
+msgid "Print this calendar"
+msgstr "Skriv ut denne kalenderen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "Forhåndsviser av kalenderen som skal skrives ut"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1675
+msgid "Go To"
+msgstr "GÃ¥ til"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:76
+#: ../modules/calendar/e-memo-shell-view-actions.c:96
+#, fuzzy
+msgid "Deleting selected memos..."
+msgstr "Sletter valgte objekter..."
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
+msgid "Copy selected memo"
+msgstr "Kopier valgt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:282
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+msgid "Cut selected memo"
+msgstr "Klipp ut valgt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
+msgid "Paste memo from the clipboard"
+msgstr "Lim inn notat fra utklippstavlen"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#, fuzzy
+msgid "_Delete Memo"
+msgstr "_Slett melding"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+msgid "Delete selected memos"
+msgstr "Slett valgt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:308
+#: ../modules/calendar/e-memo-shell-view-actions.c:667
+#, fuzzy
+msgid "New _Memo"
+msgstr "Nytt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-memo-shell-backend.c:342
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+msgid "Create a new memo"
+msgstr "Lag et nytt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:315
+#: ../modules/calendar/e-memo-shell-view-actions.c:674
+msgid "_Open Memo"
+msgstr "_Ã?pne notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+msgid "View the selected memo"
+msgstr "Vis valgt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:322
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+msgid "Open _Web Page"
+msgstr "_Ã?pne nettside"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:341
+#: ../modules/calendar/e-memo-shell-view-actions.c:857
+#, fuzzy
+msgid "Print the selected memo"
+msgstr "Vis valgt notat"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:423
+#: ../modules/calendar/e-memo-shell-view.c:120
+#, fuzzy
+msgid "Delete Memo"
+msgid_plural "Delete Memos"
+msgstr[0] "Deleger til"
+msgstr[1] "Deleger til"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
+#: ../modules/calendar/e-task-shell-view-actions.c:149
+#, fuzzy
+msgid "Deleting selected tasks..."
+msgstr "Sletter valgte objekter..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "_Assign Task"
+msgstr "Tildel oppg_ave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-view-actions.c:717
+msgid "Copy selected tasks"
+msgstr "Kopier valgte oppgaver"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:724
+msgid "Cut selected tasks"
+msgstr "Klipp ut valgte oppgaver"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:731
+msgid "Paste tasks from the clipboard"
+msgstr "Lim inn oppgaver fra utklippstavlen"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+#, fuzzy
+msgid "_Delete Task"
+msgstr "_Slett"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:738
+msgid "Delete selected tasks"
+msgstr "Slett valgte oppgaver"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "_Mark as Complete"
+msgstr "_Merk som fullført"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:794
+msgid "Mark selected tasks as complete"
+msgstr "Merk valgte oppgaver som fullført"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
+#, fuzzy
+msgid "_Mar_k as Incomplete"
+msgstr "_Merk som ikke-fullført"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
+#: ../modules/calendar/e-task-shell-view-actions.c:801
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "Merk valgte oppgaver som fullført"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
+#: ../modules/calendar/e-task-shell-view-actions.c:806
+msgid "New _Task"
+msgstr "Ny _oppgave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:398
+#: ../modules/calendar/e-task-shell-backend.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:808
+msgid "Create a new task"
+msgstr "Opprett en ny oppgave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "_Open Task"
+msgstr "_Ã?pne oppgave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+msgid "View the selected task"
+msgstr "Vis valgt oppgave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
+#: ../modules/calendar/e-memo-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:834
+#, fuzzy
+msgid "_Save as iCalendar..."
+msgstr "_Videresend som iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
+#: ../modules/calendar/e-task-shell-view-actions.c:1057
+#, fuzzy
+msgid "Print the selected task"
+msgstr "Vis valgt oppgave"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:534
+#: ../modules/calendar/e-task-shell-view.c:174
+#, fuzzy
+msgid "Delete Task"
+msgid_plural "Delete Tasks"
+msgstr[0] "Deleger til"
+msgstr[1] "Deleger til"
+
+#: ../modules/calendar/e-memo-shell-backend.c:340
+msgctxt "New"
+msgid "Mem_o"
+msgstr "N_otat"
+
+#: ../modules/calendar/e-memo-shell-backend.c:347
+#, fuzzy
+msgid "_Shared Memo"
+msgstr "_Delt notat"
+
+#: ../modules/calendar/e-memo-shell-backend.c:349
+#, fuzzy
+msgid "Create a new shared memo"
+msgstr "Lag et nytt delt notat"
+
+#: ../modules/calendar/e-memo-shell-backend.c:357
+#, fuzzy
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Notatliste"
+
+#: ../modules/calendar/e-memo-shell-backend.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+msgid "Create a new memo list"
+msgstr "Lag en ny notatliste"
+
+#: ../modules/calendar/e-memo-shell-backend.c:607
+#, fuzzy
+msgid "The registry of memo lists"
+msgstr "Primær notatliste"
+
+#: ../modules/calendar/e-memo-shell-content.c:591
+#, fuzzy
+msgid "The memo table model"
+msgstr "Modell for tabell"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:185
+msgid "Loading memos"
+msgstr "Laster notater"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:399
+#, fuzzy
+msgid "Memo List Selector"
+msgstr "Valgt av notatkilde"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:529
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#, c-format
+msgid "Opening memos at %s"
+msgstr "�pner notat på %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+msgid "Print Memos"
+msgstr "Skriv ut notater"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
+msgid "_New Memo List"
+msgstr "_Ny notatliste"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "Endre navn på valgt mappe"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "Vis k_un denne notatlisten"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:762
+#, fuzzy
+msgid "Memo _Preview"
+msgstr "_Forhåndsvis"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "Vis forhåndsvisningsområdet"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:792
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+msgid "Print the list of memos"
+msgstr "Skriv ut denne listen med notater"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:850
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "Forhåndsviser listen over notater som skal skrives ut"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:519
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d notat"
+msgstr[1] "%d notater"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:523
+#: ../modules/calendar/e-task-shell-view-private.c:688
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr ", %d valgt"
+
+#: ../modules/calendar/e-memo-shell-view.c:118
+#, fuzzy
+msgid "Delete Memos"
+msgstr "_Slett melding"
+
+#: ../modules/calendar/e-task-shell-backend.c:342
+msgctxt "New"
+msgid "_Task"
+msgstr "_Oppgave"
+
+#: ../modules/calendar/e-task-shell-backend.c:349
+#, fuzzy
+msgid "Assigne_d Task"
+msgstr "Til_delt oppgave"
+
+#: ../modules/calendar/e-task-shell-backend.c:351
+msgid "Create a new assigned task"
+msgstr "Opprett en ny tildelt oppgave"
+
+#: ../modules/calendar/e-task-shell-backend.c:359
+#, fuzzy
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Oppgaveliste"
+
+#: ../modules/calendar/e-task-shell-backend.c:361
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+msgid "Create a new task list"
+msgstr "Opprett en ny oppgaveliste"
+
+#: ../modules/calendar/e-task-shell-backend.c:615
+#, fuzzy
+msgid "The registry of task lists"
+msgstr "Primær oppgaveliste"
+
+#: ../modules/calendar/e-task-shell-content.c:614
+#, fuzzy
+msgid "The task table model"
+msgstr "Modell for tabell"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Lokasjon og hierarki for Evolutions oppgavemapper er endret siden Evolution "
+"1.x.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Kan ikke migrere oppgaver «%s»"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:183
+msgid "Loading tasks"
+msgstr "Laster oppgaver"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:397
+#, fuzzy
+msgid "Task List Selector"
+msgstr "Valgt av oppgavekilde"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:527
+msgid "This widget displays groups of task lists"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:680
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "�pner oppgaver på %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:306
+#: ../modules/calendar/e-task-shell-view-actions.c:323
+msgid "Print Tasks"
+msgstr "Skriv ut oppgaver"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:592
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"Denne operasjonen vil fjerne alle oppgaver merket som slettet permanent. "
+"Hvis du fortsetter vil du ikke kunne gjenopprette disse oppgavene. \n"
+"\n"
+"Vil du virkelig slette disse oppgavene?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#, fuzzy
+msgid "Copy..."
+msgstr "_Kopier..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+msgid "_New Task List"
+msgstr "_Ny oppgaveliste"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:780
+#, fuzzy
+msgid "Rename the selected task list"
+msgstr "Endre navn på valgt mappe"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+#, fuzzy
+msgid "Show _Only This Task List"
+msgstr "Vis k_un denne oppgavelisten"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+#, fuzzy
+msgid "Mar_k as Incomplete"
+msgstr "_Merk som ikke-fullført"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+msgid "Delete completed tasks"
+msgstr "Slett fullførte oppgaver"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:927
+msgid "Task _Preview"
+msgstr "Forhåndsvisning av _oppgave"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:929
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "Vis forhåndsvisningsområdet"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:950
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:965
+msgid "Active Tasks"
+msgstr "Aktive oppgaver"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:979
+msgid "Completed Tasks"
+msgstr "Fullførte oppgaver"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:986
+msgid "Next 7 Days' Tasks"
+msgstr "Oppgaver for de neste 7 dagene"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:993
+msgid "Overdue Tasks"
+msgstr "Utgåtte oppgaver"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
+msgid "Tasks with Attachments"
+msgstr "Oppgaver med vedlegg"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "Print the list of tasks"
+msgstr "Skriv ut denne listen over oppgaver"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1050
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
+
+#: ../modules/calendar/e-task-shell-view-private.c:684
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d oppgave"
+msgstr[1] "%d oppgaver"
+
+#: ../modules/calendar/e-task-shell-view.c:172
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "Fullførte oppgaver"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d vedlagte meldinger"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "E-post_melding"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Compose a new mail message"
+msgstr "Skriv en ny e-postmelding"
+
+#: ../modules/mail/e-mail-shell-backend.c:184
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "E-post_mappe"
+
+#: ../modules/mail/e-mail-shell-backend.c:186
+msgid "Create a new mail folder"
+msgstr "Opprett en ny e-postmappe"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: ../modules/mail/e-mail-shell-backend.c:221
+msgid "Composer Preferences"
+msgstr "Brukervalg for redigering"
+
+#: ../modules/mail/e-mail-shell-backend.c:229
+msgid "Network Preferences"
+msgstr "Brukervalg for nettverk"
+
+#. green
+#: ../modules/mail/e-mail-shell-migrate.c:958
+msgid "To Do"
+msgstr "Oppgaver"
+
+#. blue
+#: ../modules/mail/e-mail-shell-migrate.c:959
+msgid "Later"
+msgstr "Senere"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1138
+msgid "Migration"
+msgstr "Flytting"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1588
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kan ikke opprette ny mappe «%s»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1616
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1811
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1817
+#: ../modules/mail/e-mail-shell-migrate.c:2914
+msgid "Migrating Folders"
+msgstr "Flytter mapper"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
+"x.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:2021
+#, 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"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2037
+#, 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"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2069
+#, 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"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2540
+#: ../modules/mail/e-mail-shell-migrate.c:2554
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2915
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Sammendragsformat for Evolutions e-postmapper bruker sqlite fra Evolution "
+"2.24.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:3012
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3030
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
+"config.xmldb» er korrupt eller ser ikke ut til å eksistere."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1017
+#: ../modules/mail/e-mail-shell-view.c:152
+#, fuzzy
+msgid "_Disable Account"
+msgstr "Deaktiver konto"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1019
+#, fuzzy
+msgid "Disable this account"
+msgstr "Deaktiver konto"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1024
+msgid "C_reate Search Folder From Search..."
+msgstr "Opp_rett søkemappe fra søk..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1031
+msgid "_Download Messages for Offline Usage"
+msgstr "Last ne_d meldinger for frakoblet bruk"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1033
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "Last ned meldinger fra kontoer/mapper som er merket for frakoblet bruk"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+msgid "Empty _Trash"
+msgstr "Tøm _papirkurven"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1040
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
+msgid "Fl_ush Outbox"
+msgstr "T_øm utboks"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
+msgid "_Copy Folder To..."
+msgstr "_Kopier mappe til..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
+msgid "Copy the selected folder into another folder"
+msgstr "Kopier valgt mappe til en annen mappe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
+msgid "Permanently remove this folder"
+msgstr "Fjern denne mappen permanent"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
+msgid "E_xpunge"
+msgstr "T_øm"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
+msgid "Mar_k All Messages as Read"
+msgstr "Mer_k alle meldinger som lest"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
+msgid "Mark all messages in the folder as read"
+msgstr "Merk alle meldinger i en mappe som lest"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
+msgid "_Move Folder To..."
+msgstr "Flytt _mappe til..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
+msgid "Move the selected folder into another folder"
+msgstr "Flytt valgt mappe til en annen mappe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
+msgid "_New..."
+msgstr "_Ny..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
+msgid "Create a new folder for storing mail"
+msgstr "Lag en ny mappe for lagring av meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
+msgid "Change the properties of this folder"
+msgstr "Endre egenskaper for denne mappen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
+msgid "Refresh the folder"
+msgstr "Oppdater mappen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
+msgid "Change the name of this folder"
+msgstr "Endre navn på denne mappen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+msgid "Select _All Messages"
+msgstr "Velg _alle meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+msgid "Select all visible messages"
+msgstr "Velg alle synlige meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
+msgid "Select Message _Thread"
+msgstr "Velg meldings_tråd"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
+msgid "Select Message S_ubthread"
+msgstr "Velg _undertråd for melding"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
+msgid "Select all replies to the currently selected message"
+msgstr "Velg alle svar til den valgt melding"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
+msgid "_Unsubscribe"
+msgstr "_Fjern abonnement"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "Endre navn på valgt mappe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
+msgid "_New Label"
+msgstr "_Ny etikett"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#, fuzzy
+msgid "N_one"
+msgstr "Ingen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
+msgid "Hide _Read Messages"
+msgstr "Skjul _leste meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Skjul alle leste meldinger midlertidig"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
+msgid "Hide S_elected Messages"
+msgstr "Skjul valgt_e meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
+msgid "Temporarily hide the selected messages"
+msgstr "Skjul valgte meldinger midlertidig"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
+msgid "Show Hidde_n Messages"
+msgstr "Vis skjulte meldi_nger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
+msgid "Show messages that have been temporarily hidden"
+msgstr "Vis meldinger som er midlertidig skjult"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
+msgid "Cancel the current mail operation"
+msgstr "Avbryt aktiv e-postoperasjon"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
+msgid "Collapse All _Threads"
+msgstr "Slå sammen alle _tråder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
+msgid "Collapse all message threads"
+msgstr "Slå sammen alle meldingstråder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
+msgid "E_xpand All Threads"
+msgstr "Ut_vid alle tråder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
+msgid "Expand all message threads"
+msgstr "Utvid alle meldingstråder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
+msgid "_Message Filters"
+msgstr "_Meldingsfiltre"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+msgid "Create or edit rules for filtering new mail"
+msgstr "Opprett eller rediger regler for filtrering av ny e-post"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "Search F_olders"
+msgstr "Søk i _mapper"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "Opprett eller rediger definisjoner av søkemapper"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "_Subscriptions..."
+msgstr "_Abonnement..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
+msgid "F_older"
+msgstr "M_appe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
+msgid "_Label"
+msgstr "_Etikett"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
+msgid "_New Folder..."
+msgstr "_Ny mappe..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
+msgid "Hide _Deleted Messages"
+msgstr "Skjul slette_de meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1316
+msgid "Show Message _Preview"
+msgstr "Vis _forhåndsvisning av melding"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "Vis vindu for forhåndsvisning av melding"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+msgid "_Group By Threads"
+msgstr "_Grupper etter tråder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#, fuzzy
+msgid "Threaded message list"
+msgstr "Meldingsliste med tråder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
+msgid "Show message preview below the message list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "Vis meldingen under meldingslisten"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
+msgid "All Messages"
+msgstr "Alle meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
+msgid "Important Messages"
+msgstr "Viktige meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Last 5 Days' Messages"
+msgstr "Meldinger fra de siste 5 dagene"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
+msgid "Messages Not Junk"
+msgstr "Meldinger som ikke er uønsket e-post"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1390
+msgid "Messages with Attachments"
+msgstr "Meldinger med vedlegg"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
+msgid "No Label"
+msgstr "Ingen etikett"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1404
+msgid "Read Messages"
+msgstr "Leste meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1411
+msgid "Recent Messages"
+msgstr "Nye meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
+msgid "Unread Messages"
+msgstr "Uleste meldinger"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1480
+msgid "All Accounts"
+msgstr "Alle konti"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1487
+msgid "Current Account"
+msgstr "Denne kontoen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
+msgid "Current Folder"
+msgstr "Denne mappen"
+
+#: ../modules/mail/e-mail-shell-view-private.c:928
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d valgt, "
+msgstr[1] "%d valgt, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:939
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d slettet"
+msgstr[1] "%d slettet"
+
+#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:952
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d uønsket e-post"
+msgstr[1] "%d uønsket e-poster"
+
+#: ../modules/mail/e-mail-shell-view-private.c:958
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d skisse"
+msgstr[1] "%d skisser"
+
+#: ../modules/mail/e-mail-shell-view-private.c:964
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d usendt"
+msgstr[1] "%d usendte"
+
+#: ../modules/mail/e-mail-shell-view-private.c:970
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d sendt"
+msgstr[1] "%d sendt"
+
+#: ../modules/mail/e-mail-shell-view-private.c:982
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d ulest, "
+msgstr[1] "%d uleste, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:985
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d totalt"
+msgstr[1] "%d totalt"
+
+#: ../modules/mail/e-mail-shell-view.c:150
+msgid "Proxy _Logout"
+msgstr "_Logg ut proxy"
+
+#: ../modules/mail/em-composer-prefs.c:478
+msgid "Language(s)"
+msgstr "Språk"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "Hver gang"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "En gang om dagen"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "En gang i uken"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "En gang i måneden"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "Legg til egendefinert meldingshoder for uønsket e-post"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "Navn på meldingshode:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "Verdi i meldingshode inneholder:"
+
+#: ../modules/mail/em-mailer-prefs.c:326
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Topptekst"
+
+#: ../modules/mail/em-mailer-prefs.c:330
+msgid "Contains Value"
+msgstr "Inneholder verdi"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "Tillegg %s er tilgjengelig og filen er installert."
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
+
+#: ../modules/mail/em-mailer-prefs.c:752
+msgid "No Junk plugin available"
+msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
+
+#: ../modules/mail/em-mailer-prefs.c:1140
+msgid "Date header:"
+msgstr "Datohode:"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hallo Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Test av tilleggslaster for Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Testtillegg for Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Testtillegg for Python EPlugin laster."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Legg til lokale adressebøker i Evolution."
@@ -15019,19 +15985,15 @@ msgstr ""
 "påminnelse om vedlegg."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/templates/templates.c:373
 msgid "Keywords"
 msgstr "Nøkkelord"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "PÃ¥minnelse om vedlegg"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "Viser påminnelse hvis du glemmer å legge ved et vedlegg i en melding."
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -15052,35 +16014,37 @@ msgstr "_Legg til vedlegg..."
 msgid "_Edit Message"
 msgstr "R_ediger melding"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Viser påminnelse hvis du glemmer å legge ved et vedlegg i en melding."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Audio Inline"
-msgstr "Lyd i meldinger"
+#, fuzzy
+msgid "Inline Audio"
+msgstr "vCard i e-post"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
+#, fuzzy
+msgid "Play audio attachments directly in mail messages."
 msgstr "Spill av lyd-vedlegg direkte i Evolution."
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:143
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:168
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:198
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopi for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "Gjenopprett fra sikkerhetskopi"
-
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:293
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15090,18 +16054,42 @@ msgstr ""
 "kalendere, oppgaver, notater og adressebøker kan gjenopprettes. Du kan også "
 "gjenopprette alle dine personlige innstillinger, filtre etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:300
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:310
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
+#: ../plugins/backup-restore/backup-restore.c:318
+msgid "Restore from backup"
+msgstr "Gjenopprett fra sikkerhetskopi"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "_Backup Settings..."
+msgstr "_Innstillinger for sikkerhetskopiering..."
+
+#: ../plugins/backup-restore/backup-restore.c:356
+#, fuzzy
+msgid "Backup Evolution data and settings to an archive file"
+msgstr ""
+"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "R_estore Settings..."
+msgstr "Gj_enopprett innstillinger..."
+
+#: ../plugins/backup-restore/backup-restore.c:363
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
+msgstr ""
+"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
+
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mapper"
@@ -15267,19 +16255,6 @@ msgstr ""
 "ikke-lagrede data før du fortsetter. Hvis du ønsker at Evolution skal starte "
 "automatisk etter gjenoppretting kan du velge det her."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr ""
-"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "Gj_enopprett innstillinger..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "_Innstillinger for sikkerhetskopiering..."
-
 #: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
@@ -15395,20 +16370,20 @@ msgstr "Bruk _SSL"
 
 #. add refresh option
 #: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/calendar-weather/calendar-weather.c:499
 #: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:697
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
 #: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-file/calendar-file.c:296
 #: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/calendar-weather/calendar-weather.c:517
 #: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:722
 msgid "weeks"
 msgstr "uker"
 
@@ -15420,31 +16395,31 @@ msgstr "Legg til støtte for CalDAV i Evolution."
 msgid "CalDAV Support"
 msgstr "CalDAV-støtte"
 
-#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-file/calendar-file.c:208
 msgid "_Customize options"
 msgstr "_Tilpass alternativer"
 
-#: ../plugins/calendar-file/calendar-file.c:224
+#: ../plugins/calendar-file/calendar-file.c:227
 msgid "File _name:"
 msgstr "Fil_navn:"
 
-#: ../plugins/calendar-file/calendar-file.c:228
+#: ../plugins/calendar-file/calendar-file.c:231
 msgid "Choose calendar file"
 msgstr "Velg kalenderfil"
 
-#: ../plugins/calendar-file/calendar-file.c:272
+#: ../plugins/calendar-file/calendar-file.c:279
 msgid "On open"
 msgstr "Ved åpning"
 
-#: ../plugins/calendar-file/calendar-file.c:273
+#: ../plugins/calendar-file/calendar-file.c:280
 msgid "On file change"
 msgstr "Ved endring av fil"
 
-#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-file/calendar-file.c:281
 msgid "Periodically"
 msgstr "Periodisk"
 
-#: ../plugins/calendar-file/calendar-file.c:301
+#: ../plugins/calendar-file/calendar-file.c:308
 msgid "Force read _only"
 msgstr "Tvungen _skrivebeskyttelse"
 
@@ -15472,55 +16447,55 @@ msgstr "Legg til web-kalendere i Evolution."
 msgid "Web Calendars"
 msgstr "Web-kalendere"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "Vær: tåke"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "Vær: overskyet"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "Vær: overskyet natt"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "Vær: overskyet"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "Vær: byger"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "Vær: snø"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "Vær: sol"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "Vær: klar natt"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "Vær: tordenvær"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "Velg en lokasjon"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "_Enheter:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:604
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisk (celcius, cm, osv)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:605
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imerisk (Fahrenheit, tommer, osv)"
 
@@ -15532,14 +16507,6 @@ msgstr "Legg til værkalendere i Evolution."
 msgid "Weather Calendars"
 msgstr "Værkalendere"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "Copy Tool"
-msgstr "Kopieringsverktøy"
-
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy things to the clipboard."
-msgstr "Kopier objekter til utklippstavlen"
-
 #: ../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"
@@ -15562,11 +16529,6 @@ msgstr "Forvalgt e-postprogram"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:627
-msgid "Evolution"
-msgstr "Evolution"
-
 #: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Merk som _forvalgt adressebok"
@@ -15591,36 +16553,51 @@ msgstr "Forvalgte kilder"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "Merk din foretrukne adressebok og kalender som forvalgt."
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Liste med egendefinerte meldingshoder"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Nøkkelen spesifiserer en liste med egendefinerte meldingshoder som du kan "
+"legge til i en utgående melding. Format for spesifisering av et meldingshode "
+"og verdi er: Navn på egendefinert meldingshode fulgt av «=» og verdiene "
+"adskilt med «;»"
+
+#: ../plugins/email-custom-header/email-custom-header.c:332
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Unclassified"
 msgstr "Uklassifisert"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Protected"
 msgstr "Beskyttet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Top secret"
 msgstr "Topphemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#: ../plugins/email-custom-header/email-custom-header.c:583
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
+#: ../plugins/email-custom-header/email-custom-header.c:905
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
+#: ../plugins/email-custom-header/email-custom-header.c:916
+#: ../plugins/templates/templates.c:379
 msgid "Values"
 msgstr "Verdier"
 
@@ -15633,10 +16610,6 @@ msgstr ""
 "Format for spesifisering av nøkkelvedi for egendefinert meldingshode er:\n"
 "Navn på nøkkelverdi for egendefinert meldingshode delt med «;»."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "Egendefinert meldingshode i e-post"
-
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Add custom headers to outgoing mail messages."
@@ -15646,20 +16619,9 @@ msgstr "Legger til egendefinerte meldingshoder i utgående meldinger."
 msgid "Custom Header"
 msgstr "Egendefinert meldingshode"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "Liste med egendefinerte meldingshoder"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"Nøkkelen spesifiserer en liste med egendefinerte meldingshoder som du kan "
-"legge til i en utgående melding. Format for spesifisering av et meldingshode "
-"og verdi er: Navn på egendefinert meldingshode fulgt av «=» og verdiene "
-"adskilt med «;»"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Egendefinert meldingshode i e-post"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16242,11 +17204,11 @@ msgstr "_Sensitivitet: "
 msgid "_User"
 msgstr "Br_uker"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
+#: ../plugins/exchange-operations/exchange-user-dialog.c:131
 msgid "Select User"
 msgstr "Velg bruker"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
+#: ../plugins/exchange-operations/exchange-user-dialog.c:169
 msgid "Address Book..."
 msgstr "Adressebok..."
 
@@ -16405,7 +17367,6 @@ msgid "Folder offline"
 msgstr "Mappen er frakoblet"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -16525,9 +17486,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Ukjent feil ved oppslag av {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:604
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/google-account-setup/google-source.c:603
+#: ../plugins/mail-to-task/mail-to-task.c:620
+#: ../plugins/mail-to-task/mail-to-task.c:840
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -16615,7 +17576,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "Start automatisk når en ny e-post redigeres"
 
@@ -16627,6 +17588,23 @@ msgstr "Forvalgt eksternt redigeringsprogram"
 msgid "The default command that must be used as the editor."
 msgstr "Forvalgt kommando som må brukes som redigeringsprogram."
 
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "Kommando som skal kjøres for å starte redigering: "
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Bruk «xemacs» for Emacs\n"
+"Bruk «gvim -f» for VI"
+
+#: ../plugins/external-editor/external-editor.c:353
+#: ../plugins/external-editor/external-editor.c:355
+msgid "Compose in External Editor"
+msgstr "Skriv i eksternt redigeringsprogram"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "Eksternt redigeringsprogram"
@@ -16673,32 +17651,15 @@ msgstr ""
 "Eksternt redigeringsprogram som er satt i dine brukervalg for tillegg kan "
 "ikke startes. Prøv å bruke et annet redigeringsprogram."
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "Kommando som skal kjøres for å starte redigering: "
-
-#: ../plugins/external-editor/external-editor.c:110
-msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
-msgstr ""
-"Bruk «xemacs» for Emacs\n"
-"Bruk «gvim -f» for VI"
-
-#: ../plugins/external-editor/external-editor.c:354
-#: ../plugins/external-editor/external-editor.c:356
-msgid "Compose in External Editor"
-msgstr "Skriv i eksternt redigeringsprogram"
-
-#: ../plugins/face/face.c:59
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Velg et (48*48) png med størrelse < 700 byte"
 
-#: ../plugins/face/face.c:69
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG-filer"
 
-#: ../plugins/face/face.c:126
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "A_nsikt"
 
@@ -16715,35 +17676,22 @@ msgstr ""
 "Første gang må bruker konfigurere et 48*48 png-bilde. Det er base64-kodet og "
 "lagres i ~/.evolution/faces. Dette vil brukes i senere meldinger."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Fjerner abonnement på mappe «%s»"
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "Fjern abonnement på mapper"
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid ""
-"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr "Fjern abonnement på IMAP-mappe ved å høyreklikke på den i mappetreet."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Fjern abonnement"
-
-#: ../plugins/google-account-setup/google-source.c:81
 #: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:80
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>Tjener</b> "
+
+#: ../plugins/google-account-setup/google-source.c:498
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Oppgi passord for %s for å aksessere liste med abonnerte kalendere."
 
-#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/google-account-setup/google-source.c:603
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16752,19 +17700,14 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:738
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:773
 msgid "Retrieve _list"
 msgstr "Hent _liste"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>Tjener</b> "
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "Legg til kalendere fra Google i Evolution."
@@ -16785,8 +17728,13 @@ msgstr "Legg til støtte for Novell GroupWise i Evolution."
 msgid "GroupWise Account Setup"
 msgstr "Oppsett av konto for GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:219
-#, c-format
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:386
+msgid "Create folder"
+msgstr "Opprett mappe"
+
+#: ../plugins/groupwise-features/install-shared.c:218
+#, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -16796,7 +17744,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "Bruker «%s» har delt en mappe med deg\n"
@@ -16810,11 +17758,11 @@ msgstr ""
 "Klikk «Framover» for å installere den delte mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:230
 msgid "Install the shared folder"
 msgstr "Installer delt mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:234
 msgid "Shared Folder Installation"
 msgstr "Installering av delt mappe"
 
@@ -16840,7 +17788,6 @@ msgid "Email:"
 msgstr "E-post:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Deaktiver"
 
@@ -16852,6 +17799,12 @@ msgstr "Aktiv_er"
 msgid "_Junk List"
 msgstr "_Uønsket e-postliste"
 
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "Fje_rn"
+
 #: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Trekk tilbake melding"
@@ -17088,8 +18041,8 @@ msgstr "<b>Kontonavn</b>"
 msgid "Proxy Login"
 msgstr "Proxy-innlogging"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
 #: ../plugins/groupwise-features/proxy.c:488
 #: ../plugins/groupwise-features/send-options.c:86
 #, c-format
@@ -17099,7 +18052,7 @@ msgstr "%sSkriv inn passord for %s (bruker %s)"
 #. 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
-#: ../plugins/groupwise-features/proxy-login.c:512
+#: ../plugins/groupwise-features/proxy-login.c:513
 msgid "_Proxy Login..."
 msgstr "_Brukernavn for proxy..."
 
@@ -17130,7 +18083,7 @@ msgstr "Oppgi brukere og sett rettigheter"
 msgid "New _Shared Folder..."
 msgstr "Ny _delt mappe..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:448
 msgid "Sharing"
 msgstr "Deling"
 
@@ -17207,11 +18160,11 @@ msgstr "Legg til støtte for Hula i Evolution."
 msgid "Hula Support"
 msgstr "Støtte for Hula"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:331
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:344
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
 
@@ -17324,116 +18277,116 @@ msgstr "En avtale i kalender «%s» er i konflikt med dette møtet"
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:762
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:769
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette møtet i noen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:773
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:848
 msgid "Opening the calendar. Please wait.."
 msgstr "Ã?pner kalender. Vennligst vent..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:851
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter en eksisterende versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1033
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1120
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1136
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1141
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1247
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1357
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1390
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende møteinformasjon. Møtet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1434
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1437
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#: ../plugins/itip-formatter/itip-formatter.c:1505
+#: ../plugins/itip-formatter/itip-formatter.c:1516
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1506
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17441,15 +18394,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1677
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1558
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17457,11 +18410,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17469,31 +18422,31 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2350
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2583
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2593
+#: ../plugins/itip-formatter/itip-formatter.c:2626
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2608
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
@@ -17984,18 +18937,6 @@ msgid ""
 msgstr ""
 "Dette svaret er ikke fra en nåværende deltaker. Legg til sender som deltaker?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "_Logg ut proxy"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "Deaktiver konto"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr "Deaktiver en konto ved å høyreklikke på den i mappetreet."
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Pip eller spill av en lydfil."
@@ -18031,53 +18972,60 @@ msgid "Play sound when new messages arrive."
 msgstr "Spill en lyd når nye meldinger ankommer."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Lydfil som skal spilles av når nye meldinger ankommer hvis pip-modus ikke er "
+"aktivert."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "Vis melding sammen med ikonet."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Vis ikon for ny melding i varslingsområdet når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "Navn på lydfil som skal spilles av."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Lydfil som skal spilles av når nye meldinger ankommer hvis pip-modus ikke er "
 "aktivert."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Om en lydfil eller et pip skal spilles av når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Om en melding skal vises over ikonet når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "Om ikonet skal blinke eller ikke."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "Genererer en _D-Bus-melding"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:297
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:318
 msgid "Mail Notification Properties"
 msgstr "Egenskaper for varsling om ny e-post"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:498
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18092,58 +19040,59 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:503
+#: ../plugins/mail-notification/mail-notification.c:432
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:454
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:511
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:539
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:757
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "_Spill en lydfil"
+#: ../plugins/mail-notification/mail-notification.c:770
+msgid "Use sound _theme"
+msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "Spesifiser _filnavn:"
+#: ../plugins/mail-notification/mail-notification.c:789
+#, fuzzy
+msgid "Play _file:"
+msgstr "_Spill en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "Sp_ill"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:858
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
+#: ../plugins/mail-notification/mail-notification.c:868
+msgid "Generate a _D-Bus message"
+msgstr "Genererer en _D-Bus-melding"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "Varsling om ny e-post"
@@ -18152,46 +19101,46 @@ msgstr "Varsling om ny e-post"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Varsler når nye meldinger ankommer."
 
-#: ../plugins/mail-to-task/mail-to-task.c:376
+#: ../plugins/mail-to-task/mail-to-task.c:391
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:394
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:382
+#: ../plugins/mail-to-task/mail-to-task.c:397
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
+#: ../plugins/mail-to-task/mail-to-task.c:414
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:402
+#: ../plugins/mail-to-task/mail-to-task.c:417
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
+#: ../plugins/mail-to-task/mail-to-task.c:420
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:438
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18201,7 +19150,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:429
+#: ../plugins/mail-to-task/mail-to-task.c:444
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18211,7 +19160,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
+#: ../plugins/mail-to-task/mail-to-task.c:450
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18221,25 +19170,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:494
+#: ../plugins/mail-to-task/mail-to-task.c:509
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:520
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570
+#: ../plugins/mail-to-task/mail-to-task.c:591
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke åpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:627
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18247,7 +19196,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:630
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18255,7 +19204,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
+#: ../plugins/mail-to-task/mail-to-task.c:633
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18263,55 +19212,47 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:840
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "Konverter en e-postmelding til en oppgave."
-
-#: ../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 "Create a Mem_o"
-msgstr "Lag et n_otat"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Create a _Meeting"
-msgstr "Lag et _møte"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-msgid "Create a _Task"
-msgstr "Lag en o_ppgave"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-msgid "Mail-to-Task"
-msgstr "E-post til oppgave"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#: ../plugins/mail-to-task/mail-to-task.c:957
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#: ../plugins/mail-to-task/mail-to-task.c:962
+msgid "Create a _Meeting"
+msgstr "Lag et _møte"
+
+#: ../plugins/mail-to-task/mail-to-task.c:964
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt møte fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#: ../plugins/mail-to-task/mail-to-task.c:969
+msgid "Create a Mem_o"
+msgstr "Lag et n_otat"
+
+#: ../plugins/mail-to-task/mail-to-task.c:971
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#: ../plugins/mail-to-task/mail-to-task.c:976
+msgid "Create a _Task"
+msgstr "Lag en o_ppgave"
+
+#: ../plugins/mail-to-task/mail-to-task.c:978
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Konverter en e-postmelding til en oppgave."
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
 msgstr "Eier av k_ontaktliste"
@@ -18477,11 +19418,11 @@ msgstr "_Abonner på listen"
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid "Also mark messages in subfolders?"
 msgstr "Merk meldinger i undermapper også?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:45
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18489,53 +19430,36 @@ msgstr ""
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
+#: ../plugins/mark-all-read/mark-all-read.c:172
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
+#: ../plugins/mark-all-read/mark-all-read.c:186
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
+#: ../plugins/mark-all-read/mark-all-read.c:297
+msgid "Mark Me_ssages as Read"
+msgstr "Merk meldinger _som lest"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Merk alle som lest"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Merk meldinger _som lest"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Mark all messages in a folder as read."
 msgstr "Merk alle meldinger i en mappe som lest."
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "Mono-laster"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr "Støtte for tillegg skrevet i Mono."
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "Manage your Evolution plugins."
 msgstr "HÃ¥ndter tillegg for Evolution."
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "Tilleggshåndterer"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "Aktiver og deaktiver tillegg"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "_Tillegg"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "Fofatter(e)"
 
@@ -18543,20 +19467,28 @@ msgstr "Fofatter(e)"
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:258
 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:291
+#: ../plugins/plugin-manager/plugin-manager.c:284
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/plugin-manager/plugin-manager.c:417
 msgid "Plugin"
 msgstr "Tillegg"
 
+#: ../plugins/plugin-manager/plugin-manager.c:429
+msgid "_Plugins"
+msgstr "_Tillegg"
+
+#: ../plugins/plugin-manager/plugin-manager.c:431
+msgid "Enable and disable plugins"
+msgstr "Aktiver og deaktiver tillegg"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18607,22 +19539,31 @@ msgstr "Outlook PST-import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:298
+msgid "_Mail"
+msgstr "_E-post"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "_Adressebok"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Oppgaver"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -18788,30 +19729,6 @@ msgstr "Ny lokasjon"
 msgid "Edit Location"
 msgstr "Rediger lokasjon"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hallo Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Test av tilleggslaster for Python"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Testtillegg for Python"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Testtillegg for Python EPlugin laster."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "Et tillegg som laster andre tillegg skrevet i Python."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python-laster"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -18977,26 +19894,6 @@ msgstr "_Format:"
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "Velg en enkelt kalender eller oppkaveliste for visning raskt."
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Select One Source"
-msgstr "Velg en kilde"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "Vis k_un denne kalenderen"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "Vis k_un denne notatlisten"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "Vis k_un denne oppgavelisten"
-
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
 msgstr "Leder deg gjennom første oppsett av kontoen."
@@ -19005,15 +19902,15 @@ msgstr "Leder deg gjennom første oppsett av kontoen."
 msgid "Setup Assistant"
 msgstr "Veiviser for oppsett"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19026,29 +19923,29 @@ msgstr ""
 "\n"
 "Vennligst klikk «Fremover» for å fortsette. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "Importerer filer"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:129
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "Importerer filer"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:519
 #, c-format
 msgid "Importing data."
 msgstr "Importerer data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:533
 msgid "Please wait"
 msgstr "Vennligst vent"
 
@@ -19077,22 +19974,23 @@ msgstr ""
 "Liste med nøkkelord-/verdi-par for mal-tillegg for å sette inn i en "
 "meldingskropp."
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Tillegg for å lage maler av skisser"
+
+#: ../plugins/templates/templates.c:608
+#, fuzzy
+msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:668
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:670
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Tillegg for å lage maler av skisser"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr "Dekoding av TNEF-vedlegg (winmail.dat) fra Microsoft Outlook."
@@ -19109,27 +20007,27 @@ msgstr "vCard i e-post"
 msgid "Show vCards directly in mail messages."
 msgstr "Vis vCard-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:222
+#: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:231
+#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finnes %d annen kontakt."
 msgstr[1] "Det finnes %d andre kontakter."
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
@@ -19153,22 +20051,6 @@ msgstr "URL:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unngå IfMatch (kreves med Apache < 2.2.8)"
 
-#: ../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/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution test"
-
-#: ../shell/test/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 "Authenticate proxy server connections"
 msgstr "Autentiser tilkoblinger via proxy-tjener"
@@ -19186,45 +20068,55 @@ msgid "Default sidebar width"
 msgstr "Forvalgt bredde på sidelinje"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "Forvalgt vindutilstand"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window Y coordinate"
+msgstr "Forvalgt vindutilstand"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Forvalgt vinduhøyde"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "Forvalgt vindutilstand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "Forvalgt vindubredde"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Aktiverer innstillinger for proxy ved aksess via HTTP/sikker HTTP over "
 "internett."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "Vertsnavn for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "Passord for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "Port for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "Brukernavn for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 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.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19232,64 +20124,64 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial attachment view"
 msgstr "Forvalgt vedleggsvisning"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial file chooser folder"
 msgstr "Forvalgt mappe for filvelger"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Forvalgt mappe for GtkFileChooser-dialoger."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgradert konfigurasjonsversjon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 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.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Verter som ikke bruker proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Passord som skal sendes som autentisering ved bruk av HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Konfigurasjonsmodus for proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "Vertsnavn for SOCKS-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "Port for SOCKS-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Vertsnavn for sikker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Port for sikker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19297,23 +20189,23 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "Sidelinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:324
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "Statuslinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19321,19 +20213,29 @@ msgstr ""
 "Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå "
 "(for eksempel «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "Forvalgt bredde på hovedvinduet i piksler."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "Forvalgt bredde på hovedvinduet i piksler."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "Forvalgt høyde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "Forvalgt bredde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "Forvalgt bredde på sidelinjen i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19341,37 +20243,37 @@ msgstr ""
 "Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/"
 "konfigurasjonsnivå (for eksempel «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "Maskinnavn for HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Maskinnavn for HTTPS-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "Maskinnavn for socks-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19381,7 +20283,7 @@ msgstr ""
 "«toolbar» er satt vil stilen på knappene bli bestemt av GNOME «toolbar»-"
 "instillingene."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19389,78 +20291,102 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "URL som oppgir verdier for konfigurasjon av proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Bruk HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Brukernavn for autentisering med HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 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.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Om vinduet skal være maksimert."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidelinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 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.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Om vinduknappene skal være synlige."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Knappestil for vindu"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Aktive forbindelser</b>"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-content.c:870
+#, fuzzy
+msgid "Sho_w:"
+msgstr "_Vis: "
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:895
+#, fuzzy
+msgid "Sear_ch:"
+msgstr "Sø_k: "
+
+#. Scope Combo Widgets
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:932
+#, fuzzy
+msgid "i_n"
+msgstr " _i "
+
+#: ../shell/e-shell-content.c:1356
+msgid "Advanced Search"
+msgstr "Avansert søk"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktive tilkoblinger"
+#: ../shell/e-shell-content.c:1414 ../shell/e-shell-content.c:1415
+msgid "Searches"
+msgstr "Søk"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
+#: ../shell/e-shell-content.c:1460
+msgid "Save Search"
+msgstr "Lagre søk"
 
-#: ../shell/e-shell-importer.c:128
+#: ../shell/e-shell-importer.c:119
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:122
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -19468,11 +20394,11 @@ msgstr ""
 "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
 "er fra listen."
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:126
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:132
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19484,191 +20410,555 @@ msgstr ""
 "som kunne importeres ble funnet. Hvis du vil prøve igjen\n"
 "kan du klikke på «Tilbake»-knappen.\n"
 
-#: ../shell/e-shell-importer.c:295
+#: ../shell/e-shell-importer.c:263
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:268
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../shell/e-shell-importer.c:309
+#: ../shell/e-shell-importer.c:277
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../shell/e-shell-importer.c:357
+#: ../shell/e-shell-importer.c:329
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../shell/e-shell-importer.c:360
+#: ../shell/e-shell-importer.c:332
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "_Importer"
+#: ../shell/e-shell-importer.c:687 ../shell/e-shell-importer.c:701
+msgid "Evolution Import Assistant"
+msgstr "Importeringsassistent for Evolution"
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "Evolution brukervalg"
+#: ../shell/e-shell-importer.c:696
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Velkommen til Evolutions importeringsassistent.\n"
+"Gjennom denne veiviseren vil du ledes gjennom import av\n"
+"eksterne filer til Evolution."
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
+#: ../shell/e-shell-importer.c:715
+msgid "Importer Type"
+msgstr "Type import"
+
+#: ../shell/e-shell-importer.c:728
+msgid "Select Information to Import"
+msgstr "Velg informasjon som skal importeres"
+
+#: ../shell/e-shell-importer.c:740
+msgid "Select a File"
+msgstr "Velg en fil"
+
+#: ../shell/e-shell-importer.c:749
+msgid "Import Location"
+msgstr "Importer lokasjon"
+
+#: ../shell/e-shell-importer.c:755
+#, fuzzy
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Klikk på «Importer» for å starte import av filen til Evolution."
+
+#: ../shell/e-shell-importer.c:759
+msgid "Import File"
+msgstr "Importer fil"
+
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
 #, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell-switcher.c:446
+#, fuzzy
+msgid "Toolbar Style"
+msgstr "S_til for verktøylinje"
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#: ../shell/e-shell-switcher.c:447
+msgid "The switcher's toolbar style"
 msgstr ""
-"GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-msgid "Error executing %s. (%s)"
-msgstr "Feil under kjøring av %s. (%s)"
+#: ../shell/e-shell-switcher.c:463
+#, fuzzy
+msgid "Toolbar Visible"
+msgstr "Verktøylinjen er synlig"
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "Bug buddy er ikke installert."
+#: ../shell/e-shell-switcher.c:464
+#, fuzzy
+msgid "Whether the switcher is visible"
+msgstr "Om sidelinjen skal være synlig."
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy kunne ikke kjøres."
+#: ../shell/e-shell-view.c:516
+#, fuzzy
+msgid "Switcher Action"
+msgstr "Bytt til %s"
+
+#: ../shell/e-shell-view.c:517
+msgid "The switcher action for this shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:532
+#, fuzzy
+msgid "Page Number"
+msgstr "Serienummer"
+
+#: ../shell/e-shell-view.c:533
+msgid "The notebook page number of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:551
+msgid "The title of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:566
+msgid "The EShellBackend for this shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:581
+msgid "Shell Content Widget"
+msgstr ""
+
+#: ../shell/e-shell-view.c:582
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:598
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "Forvalgt bredde på sidelinje"
+
+#: ../shell/e-shell-view.c:599
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:614
+msgid "Shell Taskbar Widget"
+msgstr ""
+
+#: ../shell/e-shell-view.c:615
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:630
+#, fuzzy
+msgid "Shell Window"
+msgstr "Nytt _vindu"
+
+#: ../shell/e-shell-view.c:631
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:646
+#, fuzzy
+msgid "Current View ID"
+msgstr "_Aktiv visning"
+
+#: ../shell/e-shell-view.c:647
+#, fuzzy
+msgid "The current GAL view ID"
+msgstr "Lagre aktiv egendefinert visning"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:938
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas gnome org>"
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-commands.c:1163
-msgid "_Work Online"
-msgstr "Ar_beid tilkoblet"
+#: ../shell/e-shell-window-actions.c:1239
+#, fuzzy
+msgid "Bug Buddy is not installed."
+msgstr "Bug buddy er ikke installert."
+
+#: ../shell/e-shell-window-actions.c:1241
+#, fuzzy
+msgid "Bug Buddy could not be run."
+msgstr "Bug buddy kunne ikke kjøres."
+
+#: ../shell/e-shell-window-actions.c:1343
+#, fuzzy
+msgid "GNOME Pilot is not installed."
+msgstr "Bug buddy er ikke installert."
+
+#: ../shell/e-shell-window-actions.c:1345
+#, fuzzy
+msgid "GNOME Pilot could not be run."
+msgstr "Bug buddy kunne ikke kjøres."
+
+#: ../shell/e-shell-window-actions.c:1439
+msgid "Show information about Evolution"
+msgstr "Vis informasjon om Evolution"
+
+#: ../shell/e-shell-window-actions.c:1444
+msgid "_Close Window"
+msgstr "_Lukk vindu"
+
+#: ../shell/e-shell-window-actions.c:1451
+#, fuzzy
+msgid "_Contents"
+msgstr "A_vtaler"
+
+#: ../shell/e-shell-window-actions.c:1453
+#, fuzzy
+msgid "Open the Evolution User Guide"
+msgstr "Ã?pne annen brukers mappe"
+
+#: ../shell/e-shell-window-actions.c:1458
+msgid "Evolution _FAQ"
+msgstr "Evolution _OSS"
+
+#: ../shell/e-shell-window-actions.c:1460
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "�pne nettside med ofte stilte spørsmål"
+
+#: ../shell/e-shell-window-actions.c:1465
+msgid "_Forget Passwords"
+msgstr "_Glem passord"
+
+#: ../shell/e-shell-window-actions.c:1467
+#, fuzzy
+msgid "Forget all remembered passwords"
+msgstr "Er du sikker på at du vil glemme alle lagrede passord?"
+
+#: ../shell/e-shell-window-actions.c:1472
+msgid "I_mport..."
+msgstr "I_mporter..."
+
+#: ../shell/e-shell-window-actions.c:1474
+msgid "Import data from other programs"
+msgstr "Importer data fra andre programmer"
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "New _Window"
+msgstr "Nytt _vindu"
+
+#: ../shell/e-shell-window-actions.c:1481
+#, fuzzy
+msgid "Create a new window displaying this view"
+msgstr "Opprett et nytt vindu som viser denne mappen"
+
+#: ../shell/e-shell-window-actions.c:1488
+#, fuzzy
+msgid "Configure Evolution"
+msgstr "Konfigurasjon"
+
+#: ../shell/e-shell-window-actions.c:1493
+msgid "_Quick Reference"
+msgstr "_Hurtigreferanse"
+
+#: ../shell/e-shell-window-actions.c:1495
+#, fuzzy
+msgid "Show Evolution's shortcut keys"
+msgstr "Endre innstillinger for Evolution"
+
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Exit the program"
+msgstr "Avslutt programmet"
+
+#: ../shell/e-shell-window-actions.c:1507
+msgid "_Advanced Search..."
+msgstr "_Avansert søk..."
+
+#: ../shell/e-shell-window-actions.c:1509
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1516
+#, fuzzy
+msgid "Clear the current search parameters"
+msgstr "Tøm søk"
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "_Edit Saved Searches..."
+msgstr "R_ediger lagrede søk..."
+
+#: ../shell/e-shell-window-actions.c:1523
+#, fuzzy
+msgid "Manage your saved searches"
+msgstr "HÃ¥ndter e-post, kontakter og kalender"
+
+#: ../shell/e-shell-window-actions.c:1528
+msgid "_Find Now"
+msgstr "_Finn nå "
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1530
+#, fuzzy
+msgid "Execute the current search parameters"
+msgstr "Avbryt aktiv e-postoperasjon"
+
+#: ../shell/e-shell-window-actions.c:1537
+msgid "Click here to change the search type"
+msgstr "Klikk her for å endre søketype"
+
+#: ../shell/e-shell-window-actions.c:1542
+msgid "_Save Search..."
+msgstr "_Lagre søk..."
+
+#: ../shell/e-shell-window-actions.c:1544
+#, fuzzy
+msgid "Save the current search parameters"
+msgstr "Lagre aktiv fil"
 
-#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1549
+msgid "Send / _Receive"
+msgstr "Send / _motta"
+
+#: ../shell/e-shell-window-actions.c:1551
+msgid "Send queued items and retrieve new items"
+msgstr "Send kølagte oppføringer og hent nye oppføringer"
+
+#: ../shell/e-shell-window-actions.c:1556
+#, fuzzy
+msgid "Submit _Bug Report..."
+msgstr "Sen_d inn feilrapport"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Send inn en feilrapport med Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1563
+msgid "_Synchronization Options..."
+msgstr "Alternativer for _synkronisering..."
+
+#: ../shell/e-shell-window-actions.c:1565
+msgid "Set up Pilot configuration"
+msgstr "Konfigurer Pilot"
+
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "Arbeid frakoblet"
+#: ../shell/e-shell-window-actions.c:1572
+#, fuzzy
+msgid "Put Evolution into offline mode"
+msgstr "Start i frakoblet modus"
 
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"Evolution er koblet til.\n"
-"Klikk på denne knappen for å arbeide frakoblet."
+#: ../shell/e-shell-window-actions.c:1577
+msgid "_Work Online"
+msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution er i ferd med å koble fra."
+#: ../shell/e-shell-window-actions.c:1579
+#, fuzzy
+msgid "Put Evolution into online mode"
+msgstr "Start i tilkoblet modus"
 
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
+#: ../shell/e-shell-window-actions.c:1607
+msgid "Lay_out"
+msgstr "Utf_orming"
+
+#: ../shell/e-shell-window-actions.c:1614
+msgid "_New"
+msgstr "_Ny"
+
+#: ../shell/e-shell-window-actions.c:1621
+msgid "_Search"
+msgstr "_Søk"
+
+#: ../shell/e-shell-window-actions.c:1628
+msgid "_Switcher Appearance"
+msgstr "Ut_seende for bytter"
+
+#: ../shell/e-shell-window-actions.c:1642
+msgid "_Window"
+msgstr "_Vindu"
+
+#: ../shell/e-shell-window-actions.c:1652
+msgid "Show Side _Bar"
+msgstr "Vis si_delinje"
+
+#: ../shell/e-shell-window-actions.c:1654
+#, fuzzy
+msgid "Show the side bar"
+msgstr "Vis si_delinje"
+
+#: ../shell/e-shell-window-actions.c:1660
+msgid "Show _Status Bar"
+msgstr "Vis _statuslinje"
+
+#: ../shell/e-shell-window-actions.c:1662
+#, fuzzy
+msgid "Show the status bar"
+msgstr "Vis _statuslinje"
+
+#: ../shell/e-shell-window-actions.c:1668
+#, fuzzy
+msgid "Show _Buttons"
+msgstr "Vis animasjoner"
+
+#: ../shell/e-shell-window-actions.c:1670
+#, fuzzy
+msgid "Show the switcher buttons"
+msgstr "Vis den andre tidssonen"
+
+#: ../shell/e-shell-window-actions.c:1676
+#, fuzzy
+msgid "Show _Tool Bar"
+msgstr "Vis verk_tøylinje"
+
+#: ../shell/e-shell-window-actions.c:1678
+#, fuzzy
+msgid "Show the toolbar"
+msgstr "Vis verk_tøylinje"
+
+#: ../shell/e-shell-window-actions.c:1700
+msgid "_Icons Only"
+msgstr "Kun _ikoner"
+
+#: ../shell/e-shell-window-actions.c:1702
+msgid "Display window buttons with icons only"
+msgstr "Vis bare ikoner på vinduknapper"
+
+#: ../shell/e-shell-window-actions.c:1707
+msgid "_Text Only"
+msgstr "Kun _tekst"
+
+#: ../shell/e-shell-window-actions.c:1709
+msgid "Display window buttons with text only"
+msgstr "Vis bare tekst på vinduknapper"
+
+#: ../shell/e-shell-window-actions.c:1714
+msgid "Icons _and Text"
+msgstr "Ikoner _og tekst"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Display window buttons with icons and text"
+msgstr "Vis tekst og ikoner på vinduknapper"
+
+#: ../shell/e-shell-window-actions.c:1721
+msgid "Tool_bar Style"
+msgstr "S_til for verktøylinje"
+
+#: ../shell/e-shell-window-actions.c:1723
+msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
-"Evolution er frakoblet.\n"
-"Klikk på denne knappen for å arbeide tilkoblet."
+"Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
 
-#: ../shell/e-shell-window.c:778
-#, c-format
-msgid "Switch to %s"
-msgstr "Bytt til %s"
+#: ../shell/e-shell-window-actions.c:1731
+msgid "Define Views..."
+msgstr "Definer visninger..."
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "Ukjent systemfeil."
+#: ../shell/e-shell-window-actions.c:1733
+msgid "Create or edit views"
+msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1738
+msgid "Save Custom View..."
+msgstr "Lagre egendefinert visning..."
 
-#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "OK"
+#: ../shell/e-shell-window-actions.c:1740
+msgid "Save current custom view"
+msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
+#: ../shell/e-shell-window-actions.c:1747
+msgid "C_urrent View"
+msgstr "A_ktiv visning"
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
+#: ../shell/e-shell-window-actions.c:1757
+msgid "Custom View"
+msgstr "Egendefinert visning"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "Konfigurasjonsdatabase ikke funnet"
+#: ../shell/e-shell-window-actions.c:1759
+msgid "Current view is a customized view"
+msgstr "Aktiv visning er en egendefinert visning"
+
+#: ../shell/e-shell-window-actions.c:1769
+#, fuzzy
+msgid "Change the page settings for your current printer"
+msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ../shell/e-user-creatable-items-handler.c:674
-#: ../shell/e-user-creatable-items-handler.c:684
-#: ../shell/e-user-creatable-items-handler.c:689
+#: ../shell/e-shell-window-actions.c:2015
+#, c-format
+msgid "Switch to %s"
+msgstr "Bytt til %s"
+
+#: ../shell/e-shell-window-actions.c:2218
+msgid "Execute these search parameters"
+msgstr ""
+
+#: ../shell/e-shell-window-private.c:260
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "Ny test"
-
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "_Test"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:577
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "Opprett en ny testoppføring"
+#: ../shell/e-shell-window.c:282
+msgid "Active Shell View"
+msgstr ""
 
-#: ../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."
+#: ../shell/e-shell-window.c:283
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "Navn på ny visning:"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Importeringsassistent for Evolution"
+#: ../shell/e-shell-window.c:297
+#, fuzzy
+msgid "Safe Mode"
+msgstr "Markør_modus"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "Importer fil"
+#: ../shell/e-shell-window.c:298
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "Om tillegget er aktivert"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "Importer lokasjon"
+#: ../shell/e-shell-window.c:329
+#, fuzzy
+msgid "UI Manager"
+msgstr "Leder"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "Type import"
+#: ../shell/e-shell-window.c:330
+msgid "The shell window's GtkUIManager"
+msgstr ""
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "Velg informasjon som skal importeres"
+#: ../shell/e-shell.c:208
+#, fuzzy
+msgid "Preparing to go offline..."
+msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "Velg en fil"
+#: ../shell/e-shell.c:262
+#, fuzzy
+msgid "Preparing to go online..."
+msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
+#: ../shell/e-shell.c:325
+msgid "Preparing to quit..."
 msgstr ""
-"Velkommen til Evolutions importeringsassistent.\n"
-"Gjennom denne veiviseren vil du ledes gjennom import av\n"
-"eksterne filer til Evolution."
+
+#: ../shell/e-shell.c:705
+#, fuzzy
+msgid "Network Available"
+msgstr "TLS er ikke tilgjengelig"
+
+#: ../shell/e-shell.c:706
+#, fuzzy
+msgid "Whether the network is available"
+msgstr "Om tillegget er aktivert"
+
+#: ../shell/e-shell.c:721 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "Tilkoblet"
+
+#: ../shell/e-shell.c:722
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "Om tillegget er aktivert"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:173
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19703,7 +20993,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:250
+#: ../shell/main.c:197
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19711,43 +21001,43 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:204
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:326
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:494
+#: ../shell/main.c:329
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:333
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:336
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:503
+#: ../shell/main.c:338
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:505
+#: ../shell/main.c:340
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:614
+#: ../shell/main.c:491
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:511
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19761,22 +21051,14 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Er du sikker på at du vil glemme alle lagrede passord?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "Kan ikke starte Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "Slett gamle data fra versjon {0}?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution kan ikke starte."
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -19784,15 +21066,15 @@ msgstr ""
 "Glemming av passord tømmer alle passord som huskes av programmet. Du vil bli "
 "spurt igjen neste gang de kreves."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "Ikke nok diskplass for oppgraderingen."
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "Vil du virkelig slette gamle data?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -19814,7 +21096,7 @@ msgstr ""
 "NÃ¥r disse er slettet kan du ikke nedgradere til forrige versjon av Evolution "
 "uten å gjøre manuelle inngrep.\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -19830,11 +21112,12 @@ msgstr ""
 "dataene vil du kunne fjerne innholdet i &quot;evolution&quot; manuelt når du "
 "ønsker det.\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+msgid "Upgrade from previous version failed:"
 msgstr "Oppgradering fra forrige versjon feilet: {0}"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -19847,45 +21130,22 @@ msgstr ""
 "\n"
 "Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"Systemkonfigurasjonen stemmer ikke overens med konfigurasjonen i Evolution.\n"
-"\n"
-"Klikk på hjelp for detaljer"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"Systemkonfigurasjonen din er ikke lik Evolution konfigurasjonen din:\n"
-"\n"
-"{0}\n"
-"\n"
-"Klikk på «hjelp» for detaljer."
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "_Glem"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "_Behold data"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "_Vis påminnelse senere"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
+#, fuzzy
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -19895,6 +21155,94 @@ msgstr ""
 "Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
 "gamle data.\n"
 
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+msgctxt "New"
+msgid "_Test Item"
+msgstr "_Test"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "Opprett en ny testoppføring"
+
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Ressurs"
+
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+msgid "Create a new test source"
+msgstr "Opprett en ny testoppføring"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:958
+#, fuzzy, c-format
+msgid "Starting %s"
+msgstr "Søker i %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, fuzzy, c-format
+msgid "Not a launchable item"
+msgstr "Redigering kunne ikke starte"
+
+#: ../smclient/eggsmclient.c:225
+#, fuzzy
+msgid "Disable connection to session manager"
+msgstr "_Direkte tilkobling til internett"
+
+#: ../smclient/eggsmclient.c:228
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "Konfigurer Pilot"
+
+#: ../smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+#, fuzzy
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:253
+#, fuzzy
+msgid "Show session management options"
+msgstr "Vis bildeanimasjoner"
+
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
@@ -19926,54 +21274,58 @@ msgstr ""
 "sertifikatet stoler du heller ikke på at dette sertifikatet er autentisk med "
 "mindre annet indikeres her"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:384
+#: ../smime/gui/certificate-manager.c:612
 msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:399
+#: ../smime/gui/certificate-manager.c:626
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:714
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/certificate-manager.c:507
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:302
 msgid "Expires"
 msgstr "Utgår"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:393
 msgid "All email certificate files"
 msgstr "Alle sertifikatfiler for e-post"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:498
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:621
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
+#: ../smime/gui/certificate-manager.c:1052
+msgid "Certificates"
+msgstr "Sertifikater"
+
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -20391,1298 +21743,6 @@ msgstr "Kunne ikke kjøre «%s»: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Stenger ned %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "Egenskaper for adresse_bok"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "Endre egenskaper for valgt mappe"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "Ko_pier alle kontakter til..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "_Forhåndsvisning av kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopier"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "Kopier valgte kontakter til en annen mappe"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Kopier kontakter fra valgt mappe til en annen mappe"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Kopier utvalget"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "Kopier til mappe..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "Opprett en ny adressebokmappe"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Klipp ut utvalget"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "Sl_ett adressebok"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "Slett valgte kontakter"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "Slett valgt mappe"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "Videresend kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "Fl_ytt alle kontakter til..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "Flytt valgte kontakter til en annen mappe"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "Flytt kontakter fra valgt mappe til en annen mappe"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "Flytt til mappe..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Lim inn"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Lim inn fra utklippstavlen"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "Forhåndsviser kontaktene som skal skrives ut"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "Skriv ut valgte kontakter"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "Endre navn på valgt mappe"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "L_agre adressebok som VCard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Lagre som VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "Lagre valgte kontakter som et VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-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:2719
-msgid "Select All"
-msgstr "Velg alle"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "Velg _alle"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "Velg alle kontakter"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "Send en melding til valgte kontakter"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "Send melding til kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "Send valgte kontakter til en annen person"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "Vis vindu for forhåndsvisning av kontakter"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "St_opp"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "Stopp"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "Stopp innlesing"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "Vis aktiv kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "H_andlinger"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "_Kopier kontakt til..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_Kopier mappe med kontakter til"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "_Slett kontakt"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "_Videresend kontakt..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_Flytt kontakt til..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_Flytt mappe med kontakter til"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "_Ny"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "End_re navn"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "Lagre kontakt _som VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "_Lagre mappe med kontakter som VCard."
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "_Send melding til kontakt..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Dag"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "Slett _alle oppføringer"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "Slett alle oppføringer"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "Slett avtalen"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "Slett denne oppføringen"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "GÃ¥ til"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "GÃ¥ tilbake"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "GÃ¥ fremover"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "Liste"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "MÃ¥ned"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "Neste"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Forhåndsviser av kalenderen som skal skrives ut"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "Skriv ut denne kalenderen"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "Fj_ern"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "Fjern gamle avtaler og møter"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "Velg _dato"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Velg i _dag"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "Velg en spesifikk dato"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "Velg i dag"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "Vis som liste"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "Vis en dag"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "Vis en måned"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "Vis en uke"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "Vis arbeidsuken"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "Vis denne avtalen"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Vis feilsøkingskonsoll for loggmeldinger"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "Uke"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "Arbeidsuke"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Feilsøkingslogger"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "_Ã?pne avtale"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Avbryt aktiv e-postoperasjon"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "Kopier valgt mappe til en annen mappe"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "Lag en ny mappe for lagring av meldinger"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "Opprett eller rediger definisjoner av søkemapper"
-
-#: ../ui/evolution-mail-global.xml.h:6
-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 of accounts/folders marked for offline"
-msgstr "Last ned meldinger fra kontoer/mapper som er merket for frakoblet bruk"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "Tøm _papirkurven"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "M_appe"
-
-#: ../ui/evolution-mail-global.xml.h:10
-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:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "Søk i _mapper"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "Vis _forhåndsvisning av melding"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "Vis meldingen under meldingslisten"
-
-#: ../ui/evolution-mail-global.xml.h:16
-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:17
-msgid "Show message preview window"
-msgstr "Vis vindu for forhåndsvisning av melding"
-
-#: ../ui/evolution-mail-global.xml.h:18
-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:20
-msgid "_Classic View"
-msgstr "_Klassisk visning"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "_Kopier mappe til..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "Last ne_d meldinger for frakoblet bruk"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "_Meldingsfiltre"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "Flytt _mappe til..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "_Ny..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "_Forhåndsvis"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "_Abonnement..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "_Vertikal visning"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "Endre navn på denne mappen"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "Endre egenskaper for denne mappen"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "Slå sammen alle _tråder"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "Slå sammen alle meldingstråder"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "Ut_vid alle tråder"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "T_øm"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "Utvid alle meldingstråder"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgt_e meldinger"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slette_de meldinger"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "Skjul _leste meldinger"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "Mer_k alle meldinger som lest"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "Merk alle meldinger i en mappe som lest"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "Lim inn melding(er) fra utklippstavlen"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "Fjern denne mappen permanent"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "Oppdater mappen"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "Velg _undertråd for melding"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "Velg meldings_tråd"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "Velg _alle meldinger"
-
-#: ../ui/evolution-mail-list.xml.h:26
-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:27
-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:28
-msgid "Select all replies to the currently selected message"
-msgstr "Velg alle svar til den valgt melding"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "Velg alle synlige meldinger"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "Vis skjulte meldi_nger"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "Vis meldinger som er midlertidig skjult"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Skjul alle leste meldinger midlertidig"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "Skjul valgte meldinger midlertidig"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "Meldingsliste med tråder"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "_Grupper etter tråder"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_Melding"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "L_egg til avsender i adressebok"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "_Påfør filtre"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "Legg til avsender i adressebok"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "Alle meldings_hoder"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "Aktiver filterregler på de valgte meldingene"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "Sjekk etter _uønsket e-post"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "Skriv _ny melding"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Skriv et svar til avsender av den valgte meldingen"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "Kopier valgte meldinger til en annen mappe"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "Kopier valgte meldinger til utklippstavlen"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "Opprett _regel"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "Lag en søkemappe for disse mottakerene"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "Lag en søkemappe for denne e-postlisten"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "Lag en søkemappe for denne avsenderen"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "Lag en søkemappe for dette emnet"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "Lag en regel for filtrering av meldinger med dette emnet"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "Klipp ut valgte meldinger til utklippstavlen"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "Mindre skrift"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "Vis neste viktige melding"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "Vis neste melding"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "Vis neste tråd"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "Vis neste uleste melding"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "Vis forrige viktige melding"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "Vis forrige melding"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "Vis forrige uleste melding"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "Videresend s_om..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "Filtrer på e-post_liste..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "Filtrer på se_nder..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "Filtrer på mottake_re..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "Filtrer på e_mne..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "Merk valgte meldinger for oppfølging"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "Følg _opp..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "Tvungen lasting av bilder i HTML e-post"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "Videresend den valgte meldingen sitert som et svar"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "Videresend den valgte meldingen til noen"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Videresend den valgte meldingen til noen som et vedlegg"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "Større tekst"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "Mer_k som"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "Merk valgte meldinger som lest"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "Merk valgte meldinger som viktige"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "Merk valgte meldinger som uønsket e-post"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "Merk valgte meldinger som ønsket e-post"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "Merk valgte meldinger som ulest"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "Merk valgte meldinger som uviktige"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "Merk valgte meldinger for sletting"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "Flytt valgte meldinger til en annen mappe"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "Neste v_iktige melding"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "Neste _tråd"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "Neste _uleste melding"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "Ikke uønsket e-post"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "�pne et vindu for å skrive en e-post melding"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "Ã?pne valgte meldinger i et nytt vindu"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "Ã?pne valgte meldinger i redigeringskomponenten"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "Fo_rrige uleste melding"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "Lim inn meldinger fra utklippstavlen"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "Forrig_e viktige melding"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "Forhåndsvis meldingen som skal skrives ut"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "Skriv ut denne meldingen"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "Om_diriger"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Omdiriger (bounce) den valgte meldingen til noen"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "Lagre valgte meldinger som tekstfiler"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "Søkemappe på e-post_liste..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "Søkemappe fra mo_ttakere..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "Søkemappe for _emne..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "Søkemappe for avsen_der..."
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "Søk etter tekst i kroppen av vist melding"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "Marker _all tekst"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "Marker all tekst i meldingen"
-
-#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "Sett opp sideinnstillinger for din skriver"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "Vis meldinger med alle meldingshoder"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "Vis e-post meldingen i sin råe form"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "Angre sletting av valgte meldinger"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "_Ikke viktig"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "Zoom _ut"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "L_agt ved"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "Markør_modus"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "F_jern flagg"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "_Slett melding"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "_Finn i melding..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "Merk som _fullført"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "_GÃ¥ til"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "V_iktig"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "_I meldingen"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "_Uønsket e-post"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "_Last bilder"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "_Meldingskilde"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "_Neste melding"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "_Normal størrelse"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "_Ikke uønsket e-post"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "_Ã?pne i _nytt vindu"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "_Forrige melding"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "_Sitert"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "_Les"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "_Lagre melding..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "_Angre sletting av melding"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "_Ulest"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "_Zoom inn"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Lukk"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Hovedverktøylinje"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Kopier valgt notat"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Klipp ut valgt notat"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Slett valgt notat"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Lim inn notat fra utklippstavlen"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Forhåndsviser listen over notater som skal skrives ut"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Skriv ut denne listen med notater"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Vis valgt notat"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Ã?pne notat"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "Kopier valgte oppgaver"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "Klipp ut valgte oppgaver"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "Slett fullførte oppgaver"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "Slett valgte oppgaver"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "Mer_k som fullført"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "Merk valgte oppgaver som fullført"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "Lim inn oppgaver fra utklippstavlen"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "Skriv ut denne listen over oppgaver"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Vis vindu for forhåndsvisning av oppgaver"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "Forhåndsvisning av _oppgave"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "Vis valgt oppgave"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "_Ã?pne oppgave"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Om Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Endre innstillinger for Evolution"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "Endre synlighet for verktøylinjen"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "Opprett et nytt vindu som viser denne mappen"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "Vis tekst og ikoner på vinduknapper"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "Vis bare ikoner på vinduknapper"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "Vis bare tekst på vinduknapper"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _OSS"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Avslutt programmet"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Glem alle passord slik at du vil bli spurt om å oppgi dem igjen"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "Skjul vindusknapper"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "I_mporter..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "Ikoner _og tekst"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "Importer data fra andre programmer"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "Utf_orming"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "Nytt _vindu"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "�pne nettside med ofte stilte spørsmål"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "Side_oppsett..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "_Brukervalg"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "Send / motta"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "Send / _motta"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "Send kølagte oppføringer og hent nye oppføringer"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "Konfigurer Pilot"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "Vis si_delinje"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "Vis _statuslinje"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "Vis verk_tøylinje"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "Vis informasjon om Evolution"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "Send inn feilrapport"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "Sen_d inn feilrapport"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Send inn en feilrapport med Bug Buddy"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "Skift til frakoblet arbeidsmodus."
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "S_til for verktøylinje"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "Vis/skjul sidelinjen"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "Vis/skjul statuslinjen"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "Arbeid frak_oblet"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "_Om"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "_Lukk vindu"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "_Glem passord"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "O_fte stilte spørsmål"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "_Skjul knapper"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "Kun _ikoner"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "_Hurtigreferanse"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "A_vslutt"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "Ut_seende for bytter"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "Alternativer for _synkronisering..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "Kun _tekst"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "_Vindu"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
@@ -21833,46 +21893,6 @@ 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:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "Egendefinert visning"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "Lagre egendefinert visning"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "Definer visninger..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "A_ktiv visning"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "Velg visning: %s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "Aktiv visning er en egendefinert visning"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "Lagre egendefinert visning..."
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "Lagre aktiv egendefinert visning"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "Opprett eller rediger visninger"
-
 #: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Factory"
@@ -21893,57 +21913,51 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/misc/e-attachment.c:990
-msgid "Attached message"
-msgstr "Vedlagt melding"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
-#: ../widgets/misc/e-attachment-store.c:636
-msgid "attachment.dat"
-msgstr "vedlegg.dat"
-
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
-msgid "A load operation is already in progress"
-msgstr "En lasteoperasjon er allerede i gang"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "_Forvalgt"
 
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
-msgid "A save operation is already in progress"
-msgstr "En lagreoperasjon er allerede i gang"
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+msgid "Account Name"
+msgstr "Kontonavn"
 
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Kunne ikke laste «%s»"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "Protokoll"
 
-#: ../widgets/misc/e-attachment.c:1926
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Kunne ikke laste vedlegget"
+#: ../widgets/misc/e-action-combo-box.c:388
+#, fuzzy
+msgid "Action"
+msgstr "H_andlinger"
 
-#: ../widgets/misc/e-attachment.c:2190
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Kunne ikke åpne «%s»"
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr ""
 
-#: ../widgets/misc/e-attachment.c:2193
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Kunne ikke åpne vedlegget"
+#. Translators: This is a cancelled activity.
+#: ../widgets/misc/e-activity.c:224
+#, fuzzy, c-format
+msgid "%s (cancelled)"
+msgstr "Avbrutt"
 
-#: ../widgets/misc/e-attachment.c:2635
-msgid "Attachment contents not loaded"
-msgstr "Vedleggets innhold ble ikke lastet"
+#. Translators: This is a completed activity.
+#: ../widgets/misc/e-activity.c:227
+#, fuzzy, c-format
+msgid "%s (completed)"
+msgstr "%s (%d%% fullført)"
 
-#: ../widgets/misc/e-attachment.c:2712
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Kunne ikke lagre «%s»"
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../widgets/misc/e-activity.c:231
+#, fuzzy, c-format
+msgid "%s..."
+msgstr "%s (...)"
 
-#: ../widgets/misc/e-attachment.c:2715
+#: ../widgets/misc/e-activity.c:236
 #, c-format
-msgid "Could not save the attachment"
-msgstr "Kunne ikke lagre vedlegget"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% fullført)"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -21961,6 +21975,10 @@ msgstr "MIME-type:"
 msgid "Could not set as background"
 msgstr "Kunne ikke sette som bakgrunn"
 
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Sett som _bakgrunn"
+
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
@@ -22008,6 +22026,12 @@ msgid_plural "Save Attachments"
 msgstr[0] "Lagre vedlegg"
 msgstr[1] "Lagre vedlegg"
 
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+msgid "attachment.dat"
+msgstr "vedlegg.dat"
+
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "L_agre alle"
@@ -22016,6 +22040,14 @@ msgstr "L_agre alle"
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg..."
 
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "_Skjul"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "_Vis i meldingsteksten"
+
 #: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open with \"%s\""
@@ -22026,6 +22058,52 @@ msgstr "�pne med «%s»"
 msgid "Open this attachment in %s"
 msgstr "Ã?pne dette vedlegget i %s"
 
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Vedlagt melding"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "En lasteoperasjon er allerede i gang"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "En lagreoperasjon er allerede i gang"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Kunne ikke laste «%s»"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Kunne ikke laste vedlegget"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Kunne ikke åpne «%s»"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Kunne ikke åpne vedlegget"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "Vedleggets innhold ble ikke lastet"
+
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Kunne ikke lagre «%s»"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Kunne ikke lagre vedlegget"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
@@ -22076,14 +22154,14 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/misc/e-canvas-vbox.c:89
 #: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Minste bredde"
 
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/misc/e-canvas-vbox.c:90
 #: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-item.c:3063
@@ -22094,193 +22172,56 @@ msgstr "Minste bredde"
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "NÃ¥"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Datoen må skrives inn på formatet: %s"
-
-#: ../widgets/misc/e-cell-percent.c:76
-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:57
-msgid "Arabic"
-msgstr "Arabisk"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "Baltisk"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "Sentral-europeisk"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "Kinesisk"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "Kyrillisk"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "Gresk"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "Japansk"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "Koreansk"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "Thai"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "Tyrkisk"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "Vest-europeisk"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "Vest-europeisk, ny"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "Tradisjonell"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "Forenklet"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "Synlig"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Ukjent tegnsett: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "Tegn_koding"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:408
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:428
 msgid "Text entry to input date"
 msgstr "Tekstfelt for å oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:450
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:492
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:568
 msgid "No_w"
 msgstr "N_Ã¥"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:574
 msgid "_Today"
 msgstr "I _dag"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:582
+msgid "_None"
+msgstr "I_ngen"
+
+#: ../widgets/misc/e-dateedit.c:1675
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1705
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
-msgid "Advanced Search"
-msgstr "Avansert søk"
-
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "Lagre søk"
-
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "_Søk"
-
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "Søk"
-
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "_Lagre søk..."
-
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "R_ediger lagrede søk..."
-
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "_Avansert søk..."
-
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Alle konti"
-
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Denne kontoen"
-
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Denne mappen"
-
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "Velg et bilde"
-
 #: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Verdenskart"
@@ -22293,14 +22234,49 @@ msgstr ""
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "Tilkoblet"
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolution er koblet til.\n"
+"Klikk på denne knappen for å arbeide frakoblet."
+
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolution er frakoblet.\n"
+"Klikk på denne knappen for å arbeide tilkoblet."
+
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"Evolution er frakoblet.\n"
+"Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "Knappetilstanden er tilkoblet"
 
+#: ../widgets/misc/e-paned.c:180
+#, fuzzy
+msgid "Horizontal Position"
+msgstr "Plassering på horisontalt felt"
+
+#: ../widgets/misc/e-paned.c:181
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:192
+#, fuzzy
+msgid "Vertical Position"
+msgstr "Posisjon til vertikalt felt"
+
+#: ../widgets/misc/e-paned.c:193
+msgid "Pane position when oriented vertically"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Synkroniser med:"
@@ -22313,65 +22289,18 @@ msgstr "Synkroniser private oppføringer:"
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "Tom e-post"
-
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "Oppdater modell"
-
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "Kolonnebredde"
-
-#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
-msgid "Search"
-msgstr "Søk"
-
-#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-msgid "Click here to change the search type"
-msgstr "Klikk her for å endre søketype"
-
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "_Søk"
-
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "_Finn nå "
-
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "_Tøm"
-
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "ID for oppføring"
-
-#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "Tekst"
-
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1053
-msgid "Sho_w: "
-msgstr "_Vis: "
+#: ../widgets/misc/e-popup-action.c:173
+#, fuzzy
+msgid "Source Action"
+msgstr "Kildekonto"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "Sø_k: "
+#: ../widgets/misc/e-popup-action.c:174
+msgid "The source action to proxy"
+msgstr ""
 
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1088
-msgid " i_n "
-msgstr " _i "
+#: ../widgets/misc/e-preferences-window.c:216
+msgid "Evolution Preferences"
+msgstr "Evolution brukervalg"
 
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
@@ -22528,27 +22457,98 @@ msgstr "_NÃ¥r det passer"
 msgid "_When opened:"
 msgstr "_Ved åpning:"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:130
+#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "Uten navn"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% fullført)"
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Save and Close"
+msgstr "L_agre og lukk"
+
+#: ../widgets/misc/e-signature-editor.c:361
+msgid "Edit Signature"
+msgstr "Rediger signatur"
+
+#: ../widgets/misc/e-signature-editor.c:376
+msgid "_Signature Name:"
+msgstr "Navn på _signatur:"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+msgid "Add Signature Script"
+msgstr "Legg til signaturskript"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+msgid "Edit Signature Script"
+msgstr "Rediger signatur"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "Legg til _skript"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, fuzzy
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"Utdata fra dette skriptet vil brukes som din\n"
+"signatur. Navnet du oppgir vil kun brukes for visning på skjermen."
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+msgid "S_cript:"
+msgstr "_Skript:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+msgid "Script file must be executable."
+msgstr "Skriptfilen må eksistere og være kjørbar."
 
 #: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Klikk her for å vise URL"
 
+#: ../widgets/misc/ea-calendar-item.c:295
+#: ../widgets/misc/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalender (fra %s til %s)"
+
+#: ../widgets/misc/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "Evolution kalenderoppføring"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "oppsprettliste"
 
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "NÃ¥"
+
+#: ../widgets/table/e-cell-date-edit.c:320
+msgid "OK"
+msgstr "OK"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Datoen må skrives inn på formatet: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
+
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Valgt kolonne"
@@ -22581,6 +22581,12 @@ msgstr "Farget kolonne"
 msgid "BG Color Column"
 msgstr "Kolonne for bakgrunnsfarge"
 
+#: ../widgets/table/e-table-click-to-add.c:578
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "klikk for å legge til"
+
 #: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "Tilstand"
@@ -22615,7 +22621,7 @@ msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -22628,7 +22634,7 @@ msgid "Clear _All"
 msgstr "Fjern _alt"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Synkende"
 
@@ -22796,60 +22802,60 @@ msgstr "Enhetlig høyde på rad"
 msgid "Frozen"
 msgstr "Frosset"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning..."
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "E_gendefinert"
 
@@ -22903,6 +22909,64 @@ msgstr "Størrelse på utvider"
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpilen"
 
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "oppsprett"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "vis et avkom"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "rediger"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "start redigering av denne cellen"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "vend"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "vend cellen"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "utvid"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "utvider raden i ETree som inneholder denne cellen"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "slå sammen"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "slår sammen raden i ETree som inneholder denne cellen"
+
+#: ../widgets/table/gal-a11y-e-cell.c:120
+msgid "Table Cell"
+msgstr "Celle i tabell"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "klikk"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "sortere"
+
+#: ../widgets/text/e-text.c:2719
+msgid "Select All"
+msgstr "Velg alle"
+
 #: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Inndatametoder"
@@ -22911,6 +22975,10 @@ msgstr "Inndatametoder"
 msgid "Event Processor"
 msgstr "Hendelsesprosessor"
 
+#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "Tekst"
+
 #: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Fet"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]