Updated Norwegian bokmål translation.

author: Kjartan Maraas <kmaraas@gnome.org> 2009-12-05 19:14:08 +0800
committer: Kjartan Maraas <kmaraas@gnome.org> 2009-12-05 19:14:08 +0800
commit: 2400e28ab622bbb7bc3c7fe889c422d825c4b87c (patch)
tree: 989dde41c3193700af92e393cf68ee1fe96c2cc5 /po/nb.po
parent: 380aca61772460ddf8544049b84d67137773d86b (diff)
download: gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar
gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.gz
gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.bz2
gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.lz
gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.xz
gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.zst
gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.zip
1 files changed, 4750 insertions, 5708 deletions
diff --git a/po/nb.po b/po/nb.po
index 696c13f653..39497700c4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
 #: ../shell/main.c:507
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.27.x\n"
+"Project-Id-Version: evolution 2.29.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-18 16:38+0200\n"
-"PO-Revision-Date: 2009-09-18 16:50+0200\n"
+"POT-Creation-Date: 2009-12-04 22:02+0100\n"
+"PO-Revision-Date: 2009-12-05 12:14+0100\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"
@@ -97,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:1116
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1022
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -110,7 +110,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
 #: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
 msgid "Server Version"
 msgstr "Versjon av tjener"
 
@@ -213,10 +213,10 @@ msgstr ""
 "Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
 "nytt."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:519
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:521
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -238,7 +238,6 @@ msgstr "Br_uk som den er"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -247,351 +246,377 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:598
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1621
-#: ../addressbook/conduit/address-conduit.c:1622
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "Kunne ikke laste adressebok"
 
-#: ../addressbook/conduit/address-conduit.c:1699
-#: ../addressbook/conduit/address-conduit.c:1702
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>E-post</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>Hjem</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>Øyeblikksmeldinger</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>Jobb</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Forskjellig</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>Notater</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>Annet</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>Telefon</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>Nettadresser</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1834
+msgid "Anniversary"
+msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>Arbeid</b>"
+#. 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/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1833 ../shell/main.c:110
+msgid "Birthday"
+msgstr "Fødselsdag"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1238
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Calendar:"
+msgstr "Kalender:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:311
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1265
 #: ../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:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:591
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2497
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:808
+msgid "Email"
+msgstr "E-post"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "Ledig/opptatt:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "Hjemme"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "Hjemmeside:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "Bilde"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "Øyeblikksmeldinger"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "Jobb"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+msgid "Miscellaneous"
+msgstr "Forskjellig"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../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
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:567
 msgid "Notes"
 msgstr "Notater"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1542
+msgid "Other"
+msgstr "Andre"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "Videoprat:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "Nettadresser"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "Weblogg:"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../modules/mail/e-mail-shell-migrate.c:957
+msgid "Work"
+msgstr "Arbeid"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1928
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "_By:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "F_irma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "Av_deling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "_Ledig/opptatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "_Leder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "_Ektefelle:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "_Videoprat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Ønsker å motta HTML-formatert e-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "_Weblogg:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
 #: ../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/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-define-views-dialog.c:338
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:61
 msgid "Name"
 msgstr "Navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1258
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:339
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1285
 #: ../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:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:542
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 #: ../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
+#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
 #: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:538
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:534
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../modules/mail/e-mail-shell-migrate.c:956
-msgid "Work"
-msgstr "Arbeid"
-
-#: ../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:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:445
-#: ../calendar/gui/e-calendar-view.c:1603
-msgid "Other"
-msgstr "Andre"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:369
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:304
 msgid "Target Book"
 msgstr "Målbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:325
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:332
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:346
 msgid "Changed"
 msgstr "Endret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2492
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3163
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -599,186 +624,194 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3174
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3200
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3214
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:331
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:653
 msgid "Shell"
-msgstr ""
+msgstr "Skall"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:324
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:654
 msgid "The EShell singleton"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Hr.\n"
-"Fru\n"
-"Frk.\n"
-"Frøken\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Frk"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Hr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Fru"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Frk"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Hr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "_Etternavn:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Mellomnavn:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-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:666
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:695
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../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..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_Listenavn:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "_Velg..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 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:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:788
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:928
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:936
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1343
 msgid "_Members"
 msgstr "_Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1183
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1197
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1211
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1228
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1255
 #: ../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
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Book"
 msgstr "Bok"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1248
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1275
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Endret kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "Kontakt i konflikt:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplisert kontakt funnet"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -786,15 +819,15 @@ msgstr ""
 "Navnet eller e-postadressen for denne kontakten eksisterer allerede i denne "
 "mappen. Vil du legge den til likevel?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "Opprinnelig kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -802,42 +835,32 @@ msgstr ""
 "Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
 "i denne mappen. Vil du legge den til likevel?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 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:510
-#: ../addressbook/gui/widgets/eab-contact-display.c:515
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
-#: ../addressbook/gui/widgets/eab-contact-display.c:786
-#: ../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
 #: ../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:876
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Name contains"
 msgstr "Navn inneholder"
 
@@ -859,7 +882,7 @@ 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
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Query"
 msgstr "Spør"
 
@@ -868,11 +891,11 @@ msgid "Search Interrupted"
 msgstr "Søk avbrutt"
 
 #: ../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:597
-#: ../modules/calendar/e-task-shell-content.c:620
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-view.c:560
+#: ../calendar/gui/e-calendar-table.c:877 ../calendar/gui/e-memo-table.c:660
+#: ../modules/calendar/e-memo-shell-content.c:601
+#: ../modules/calendar/e-task-shell-content.c:624
+#: ../widgets/table/e-table-click-to-add.c:505
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3344
 #: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
@@ -884,65 +907,60 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
-#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
+#: ../addressbook/gui/widgets/e-addressbook-view.c:570
+#: ../calendar/gui/e-calendar-table.c:888 ../calendar/gui/e-memo-table.c:671
 msgid "Shell View"
 msgstr "Skallvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Source"
 msgstr "Kilde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1040
 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:1138
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1044
 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:1142
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1048
 #, 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:1148
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1054
 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:1152
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1058
 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:1156
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1062
 #, 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:1312
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "Save as vCard..."
-msgstr "Lagre som vCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1224
+#, 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?"
+"Å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/e-addressbook-view.c:1350
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1229
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1230
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -971,7 +989,7 @@ msgid "Car Phone"
 msgstr "Biltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../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
@@ -979,7 +997,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "Firma"
 
@@ -1028,22 +1046,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "Kommentar"
 
@@ -1072,14 +1090,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:573
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../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:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -1098,7 +1115,7 @@ msgid "Telex"
 msgstr "Teleks"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:519
+#: ../shell/e-shell-view.c:520
 msgid "Title"
 msgstr "Tittel"
 
@@ -1113,7 +1130,7 @@ 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/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-click-to-add.c:519
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-container.c:995
@@ -1127,7 +1144,7 @@ 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/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-click-to-add.c:526
 #: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
@@ -1162,7 +1179,7 @@ msgstr "Maksimal lengde på feltnavn"
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -1172,7 +1189,7 @@ msgstr ""
 "\n"
 "Søker etter kontakter..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -1186,7 +1203,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:185
 msgid ""
 "\n"
 "\n"
@@ -1200,7 +1217,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1210,7 +1227,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1220,7 +1237,7 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -1282,121 +1299,105 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
-#: ../widgets/misc/e-web-view.c:330
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:362
+msgid "Copy the email address to the clipboard"
+msgstr "Kopier e-postadresser til utklippstavlen"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:367
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:206
-#: ../widgets/misc/e-web-view.c:303
-msgid "_Copy Link Location"
-msgstr "_Kopier lokasjon for lenke"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:213
-#: ../widgets/misc/e-web-view.c:313
-msgid "_Open Link in Browser"
-msgstr "_Åpne lenke i nettleser"
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:369
+msgid "Send a mail message to this address"
+msgstr "Send en e-postmelding til denne adressen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:309
-#: ../addressbook/gui/widgets/eab-contact-display.c:320
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:404
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:329
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view.c:475
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#. 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:575
-#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:127
-msgid "Birthday"
-msgstr "Fødselsdag"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/e-calendar-view.c:1895
-msgid "Anniversary"
-msgstr "Bryllupsdag"
-
 #. 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:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:167
@@ -1405,130 +1406,136 @@ msgstr "Bryllupsdag"
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:156
 #: ../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
+#: ../modules/mail/e-mail-shell-migrate.c:958
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:771
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Weblogg"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1042
+#: ../widgets/misc/e-web-view.c:708
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klikk for å sende melding til %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 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:60
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/e-cal-component-preview.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:1
+#: ../calendar/gui/e-cal-component-preview.c:293
 #: ../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
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:215
+#: ../calendar/gui/e-calendar-table.c:226
+#: ../calendar/gui/e-calendar-table.c:791 ../calendar/gui/print.c:2619
 msgid "Canceled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 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:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "Ikke tilgjengelig i frakoblet modus"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "Annen feil"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "Ugyldig versjon av tjener"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "Autentiseringsmetoden er ikke støttet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 "
@@ -1538,7 +1545,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:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1547,7 +1554,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:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 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."
@@ -1556,7 +1563,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1564,11 +1571,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:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "Detaljert feilmelding:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1580,7 +1587,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:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 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"
@@ -1592,68 +1599,44 @@ msgstr ""
 "nøyaktig eller hev tidsgrensen i brukervalgene til katalogtjeneren\n"
 "for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 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:180
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 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:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s eksisterer allerede\n"
-"Vil du overskrive den?"
-
-#: ../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: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:304
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:245
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:599
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:602
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1662,10 +1645,10 @@ msgid "Card View"
 msgstr "Kortvisning"
 
 #: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
+#: ../addressbook/importers/evolution-ldif-importer.c:511
 #: ../addressbook/importers/evolution-vcard-importer.c:252
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Importerer..."
 
@@ -1693,11 +1676,11 @@ msgstr "Evolution CSV eller Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:678
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
@@ -1780,22 +1763,22 @@ msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
-#: ../addressbook/util/addressbook.c:102
+#: ../addressbook/util/addressbook.c:103
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: ../addressbook/util/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:530
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: ../addressbook/util/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:510
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
 
-#: ../addressbook/util/addressbook.c:222
+#: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:518
 #: ../plugins/publish-calendar/publish-calendar.c:215
@@ -1890,96 +1873,100 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Er du sikker på at du vil slette møtet med navn «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Er du sikker på at du vil slette notatet «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Er du sikker på at du vil slette disse {0} notatene?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil slette dette møtet?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Er du sikker på at du vil slette dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "Kalenderlager er frakoblet."
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Kan ikke opprette en ny hendelse"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "Kan ikke lagre hendelse"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "Slett kalender «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "Slett notatliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "Ikke se_nd"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Nedlasting pågår. Vil du lagre avtalen?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Nedlasting pågår. Vil du lagre oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1987,30 +1974,30 @@ msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
 "denne oppgaven."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "Feil under lasting av kalender"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "Feil under lasting av notatliste"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "Feil under lasting av oppgaveliste"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "Feil på «{0}»"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2018,7 +2005,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
 "er avlyst."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2026,7 +2013,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at notatet er slettet."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2034,23 +2021,27 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at oppgaven er slettet."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "Ingen svar fra tjeneren."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "Save Appointment"
 msgstr "Lagre avtale"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
+msgid "Save Meeting"
+msgstr "Lagre møte"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid "Save Memo"
 msgstr "Lagre notat"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid "Save Task"
 msgstr "Lagre oppgave"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2058,7 +2049,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2066,7 +2057,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2074,7 +2065,7 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2082,91 +2073,95 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
 msgid "Some features may not work properly with your current server."
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notater har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:64
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:65
 msgid "The memo list is not marked for offline usage."
 msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:68
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:69
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "Unable to load the calendar"
 msgstr "Kan ikke laste kalender"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagre dine endringer i denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Vil du lagre dine endringer i dette møtet?"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagre dine endringer i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagre dine endringer i denne oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vil du sende en avlysingsmelding for dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2176,102 +2171,270 @@ msgstr ""
 "muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
 "for å unngå problemer."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endret denne avtalen, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:83
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Du har endret dette møtet, men ikke lagret det."
+
+#: ../calendar/calendar.error.xml.h:84
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endret denne oppgaven, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endret dette notatet, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:87
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Notatene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgavene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:89
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:332
+#: ../calendar/calendar.error.xml.h:90 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:91
 msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../calendar/calendar.error.xml.h:92
+#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:93
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:94
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: ../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
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: ../calendar/conduits/memo/memo-conduit.c:908
-#: ../calendar/conduits/memo/memo-conduit.c:911
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for notatliste"
 
-#: ../calendar/conduits/memo/memo-conduit.c:955
-#: ../calendar/conduits/memo/memo-conduit.c:958
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for notatliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
 
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutt"
+msgstr[1] "minutter"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:515
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "time"
+msgstr[1] "timer"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+msgid "Start time"
+msgstr "Starttid:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
+msgid "Appointments"
+msgstr "Avtaler"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "Avvis _alle"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/e-itip-control.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1031
+msgid "Location:"
+msgstr "Sted:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
+#, fuzzy
+msgid "Snooze _time:"
+msgstr "Slutt-tid:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+msgid "_Dismiss"
+msgstr "A_vvis"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1065
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:111
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1595
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "R_ediger"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+msgid "_Snooze"
+msgstr "_Utsett"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+msgid "location of appointment"
+msgstr "sted for avtalen"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../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:739
+msgid "minutes"
+msgstr "minutter"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1436
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1558
+msgid "No summary available."
+msgstr "Sammendrag er ikke tilgjengelig."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1447
+msgid "No description available."
+msgstr "Ingen beskrivelse tilgjengelig."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
+msgid "No location information available."
+msgstr "Stedsinformasjon er ikke tilgjengelig."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1498
+#, c-format
+msgid "You have %d alarms"
+msgstr "Du har %d alarmer"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Warning"
+msgstr "Advarsel"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1674
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1704
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+msgid "Do not ask me about this program again."
+msgstr "Ikke spør meg om dette programmet igjen."
+
+#: ../calendar/gui/alarm-notify/util.c:44
+msgid "invalid time"
+msgstr "ugyldig tid"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d time"
+msgstr[1] "%d timer"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutt"
+msgstr[1] "%d minutter"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Varslingsprogrammer"
@@ -2589,14 +2752,12 @@ 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:73
-#, fuzzy
 msgid "Show the memo preview pane"
-msgstr "Vis forhåndsvisningsvinduet"
+msgstr "Vis forhåndsvisningsvinduet for notat"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-#, fuzzy
 msgid "Show the task preview pane"
-msgstr "Vis forhåndsvisningsvinduet"
+msgstr "Vis forhåndsvisningsområdet for oppgave"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
@@ -2900,9 +3061,10 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../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/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -2910,7 +3072,7 @@ msgstr "Konfidensiell"
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -2931,8 +3093,9 @@ msgstr "Eksisterer"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:721
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -2942,19 +3105,20 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../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/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../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
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
+#: ../calendar/gui/e-calendar-table.c:693 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
@@ -2963,7 +3127,7 @@ msgstr "Gjeninntreffelse"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -2992,478 +3156,451 @@ msgstr "er"
 msgid "is not"
 msgstr "er ikke"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:627
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "Rediger varsel"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>Varsel</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>Alternativer</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>Gjenta</b> "
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
-msgstr "Legg til _varsel"
+msgstr "Legg til varsel"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "Alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Tilpasset _beskjed"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "Egendefinert lyd for varsel"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "Alternativer"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "Gjenta"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "Velg en fil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "Send til:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_Argumenter:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "_Gjenta alarmen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "_Lyd:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"før\n"
-"etter"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "etter"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "før"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "dag(er)"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:335
+#: ../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:741
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:38
+msgid "days"
+msgstr "dager"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "slutt på avtalen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"minutt(er)\n"
-"time(r)\n"
-"dag(er)"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "hour(s)"
+msgstr "time(r)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"minutter\n"
-"timer\n"
-"dager"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "minute(s)"
+msgstr "minutt(er)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"avtalens start\n"
-"avtalens slutt"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "start of appointment"
+msgstr "ved avtalens start"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "Le_gg til"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "Varsel"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "Fore_slå automatisk visning av vedlegg"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "Legg ved fil(er)"
-
 #. an empty string is the same as 'None'
-#: ../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: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:95
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:106
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:155
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-day-view-time-item.c:798
+#: ../calendar/gui/e-itip-control.c:1148 ../filter/e-filter-rule.c:744
+#: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
+#: ../modules/mail/e-mail-junk-hook.c:88
 #: ../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:2217
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1555
-#: ../widgets/misc/e-dateedit.c:1766
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
+#: ../widgets/misc/e-dateedit.c:1894 ../widgets/misc/e-send-options.ui.h:11
 #: ../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:499
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:182
+#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "Velg..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 msgid "Time and date:"
 msgstr "Tid og dato:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Date only:"
 msgstr "Kun dato:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(Vises i dagvisning)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 minutter\n"
-"30 minutter\n"
-"15 minutter\n"
-"10 minutter\n"
-"5 minutter"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">Alarmer</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(Vises i dagvisning)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Varsel</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">Format for dato og tid</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Forvalgt ledig/opptatt-tjener</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../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>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">Oppgaveliste</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">Tid</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "Varsel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Arbeidsuke</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Fromat for dato ogklokkeslett"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "Dag_en slutter:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "Dager"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "Forvalgt ledig/opptatt-tjener"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "Vis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 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/cal-prefs-dialog.ui.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
 #: ../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
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2654
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "General"
 msgstr "Generelt"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"Minutter\n"
-"Timer\n"
-"Dager"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "Timer"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "Minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"Mandag\n"
-"Tirsdag\n"
-"Onsdag\n"
-"Torsdag\n"
-"Fredag\n"
-"Lørdag\n"
-"Søndag"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:102
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "S_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "_Rull månedsvisning en uke om gangen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "Se_kundær sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "Velg kalendere for varsling"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "Vis en _påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 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/cal-prefs-dialog.ui.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "Oppgaveliste"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 #: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:608
+msgid "Time"
+msgstr "Tid"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter på:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+msgid "Work Week"
+msgstr "Arbeidsuke"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "L_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "_Ti."
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "_On."
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "før hvert jubileum/bursdag"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "før hver avtale"
 
@@ -3472,15 +3609,14 @@ msgid "Type:"
 msgstr "Type:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:542
+#: ../modules/addressbook/addressbook-config.c:500
 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
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
 msgid "_Name:"
 msgstr "_Navn:"
@@ -3501,10 +3637,6 @@ msgstr "Kopier notatlisten lokalt for frakoblet operasjon"
 msgid "Colo_r:"
 msgstr "Fa_rge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "Oppgaveliste"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Notatliste"
@@ -3584,246 +3716,236 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2350
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2391
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2354
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2395
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2397
 msgid "Completed "
 msgstr "Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2402
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2363
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2404
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:241
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:501
+#: ../calendar/gui/dialogs/comp-editor.c:504
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:596
+#: ../calendar/gui/dialogs/comp-editor.c:599
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:603
+#: ../calendar/gui/dialogs/comp-editor.c:606
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:608
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:614
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:616
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:618
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:634
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:791
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppføring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:992
+#: ../calendar/gui/dialogs/comp-editor.c:995
 msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:999
+#: ../calendar/gui/dialogs/comp-editor.c:1002
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020
+#: ../calendar/gui/dialogs/comp-editor.c:1023
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:1051
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../shell/e-shell-window-actions.c:1599
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit"
-msgstr "R_ediger"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1606
+#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
-#: ../shell/e-shell-window-actions.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1648
+#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
-#: ../composer/e-composer-actions.c:304
+#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Click here to attach a file"
 msgstr "klikk her for å legge ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slår av/på visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
-#: ../composer/e-composer-private.c:68
+#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:1690
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1738
+#: ../calendar/gui/dialogs/comp-editor.c:1745
 msgid "Save"
 msgstr "Lagre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2013
-#: ../calendar/gui/dialogs/comp-editor.c:2062
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2022
+#: ../calendar/gui/dialogs/comp-editor.c:2071
+#: ../calendar/gui/dialogs/comp-editor.c:2960
 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:2912 ../mail/em-utils.c:359
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2928
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2974
+#: ../calendar/gui/dialogs/comp-editor.c:2990
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -3839,7 +3961,7 @@ msgstr "Kunne ikke åpne destinasjon"
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slett denne oppføringen fra andre mottakere's postbokser?"
 
@@ -3891,146 +4013,145 @@ msgstr "Notatet kunne ikke slettes pga en feil"
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringen kunne ikke slettes pga en feil"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "Kontakter..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Deleger til:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "V_arsel"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "Gjeninnt_reffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "Gjør denne hendelsen til repeterende"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Sett inn avanserte alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "Slår av/på hendelser som varer hele dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "Slår av/på visning av tid som opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "_Ledig/opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:292
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
-#: ../calendar/gui/dialogs/event-page.c:750
+#: ../calendar/gui/dialogs/event-page.c:751
 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:754
+#: ../calendar/gui/dialogs/event-page.c:755
 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:766
-#: ../calendar/gui/dialogs/event-page.c:2662
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2695
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:829
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1064
+#: ../calendar/gui/dialogs/event-page.c:1069
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1067
+#: ../calendar/gui/dialogs/event-page.c:1072
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:833
+#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/memo-page.c:657
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1248
+#: ../calendar/gui/dialogs/event-page.c:1253
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1271
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1283
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1440
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1445
+#: ../calendar/gui/dialogs/memo-page.c:698
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1446
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:1451
+#: ../calendar/gui/dialogs/memo-page.c:704
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1471
-#: ../calendar/gui/dialogs/task-page.c:923
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:2535
+#: ../calendar/gui/dialogs/event-page.c:2568
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
@@ -4041,171 +4162,139 @@ 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:2579
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1717
+#: ../calendar/gui/dialogs/event-page.c:2612
+#: ../calendar/gui/dialogs/memo-page.c:916
+#: ../calendar/gui/dialogs/task-page.c:1720
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2879
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2885
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2891
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:2904
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Tilpass"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"15 minutter før avtalen\n"
-"1 time før avtalen\n"
-"1 dag før avtalen"
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "1 dag før avtalen"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "1 time før avtalen"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "15 minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "De_ltakere..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Egendefinert varsel:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "Beskrivelse av hendelse"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "_Varsel"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:17
 #: ../plugins/calendar-weather/calendar-weather.c:363
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Sted:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 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: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 ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"i\n"
-"til"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgid "for"
+msgstr "i"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:515
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
-msgstr "timer"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+msgid "until"
+msgstr "til"
 
-#: ../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:739
-msgid "minutes"
-msgstr "minutter"
-
-#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2499
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2540
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Notatet kan ikke redigeres fordi valgt notatliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:877
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
+#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
+#: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Til"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "Sta_rtdato:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "T_il:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:378
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -4381,54 +4470,37 @@ msgstr "Fant ikke et utvalg å slette."
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>Unntak</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>Forhåndsvis</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>Gjeninntreffelse</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "Hver"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "Unntak"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "Forhåndsvis"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "Denne avtalen _gjeninntreffer"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"dag(er)\n"
-"uke(r)\n"
-"måned(er)\n"
-"år"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "alltid"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"i\n"
-"til\n"
-"for alltid"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "måned(er)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "uke(r)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "år"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -4443,120 +4515,165 @@ msgstr "Varsle _kun nye deltakere"
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:484
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Forskjellig\t</span>"
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:213
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:790 ../calendar/gui/e-itip-control.c:934
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2616 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:358
+msgid "Completed"
+msgstr "Fullført"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:3
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-calendar-table.c:715 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1081 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "Høy"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Status</span>"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:287
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:808
+#: ../calendar/gui/e-calendar-table.c:211
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:789 ../calendar/gui/print.c:2613
+msgid "In Progress"
+msgstr "Under arbeid"
 
-#: ../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"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:5
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-calendar-table.c:717 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1079 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "Lav"
 
-#: ../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/dialogs/task-details-page.ui.h:7
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
+#: ../widgets/misc/e-send-options.ui.h:12
+msgid "Normal"
+msgstr "Normal"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:729
+#: ../calendar/gui/e-calendar-table.c:209
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:788 ../calendar/gui/print.c:2610
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ikke startet"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:9
 msgid "P_ercent complete:"
 msgstr "Pros_ent fullført:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
 msgid "Stat_us:"
 msgstr "Stat_us:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. 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/dialogs/task-details-page.ui.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1590
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../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/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-calendar-table.c:718 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Undefined"
+msgstr "Udefinert"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
 msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "Detaljert _status"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 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:360
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:335
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:338
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:334
+#: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.c:340
 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:386
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:806
+#: ../calendar/gui/dialogs/task-page.c:809
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1674
+#: ../calendar/gui/dialogs/task-page.c:1677
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "De_ltakere..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Kategor_ier..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "Fer_dig-dato:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "Tids_sone:"
 
@@ -4576,31 +4693,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d uke"
 msgstr[1] "%d uker"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:406 ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d time"
-msgstr[1] "%d timer"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:412 ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutt"
-msgstr[1] "%d minutter"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/e-alarm-list.c:418 ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekunder"
-
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
@@ -4661,107 +4753,53 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: ../calendar/gui/e-cal-component-preview.c:110 ../filter/filter-rule.c:863
+#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:658
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../calendar/gui/e-cal-component-preview.c:116
+#: ../calendar/gui/e-cal-component-preview.c:196
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: ../calendar/gui/e-cal-component-preview.c:151
-#: ../calendar/gui/e-itip-control.c:1163
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:235
+#: ../calendar/gui/e-itip-control.c:1152 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:158
-#: ../calendar/gui/e-cal-component-preview.c:169
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-component-preview.c:257
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:180
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:191
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-itip-control.c:1177
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../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"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:198
-#: ../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:360
-msgid "Completed"
-msgstr "Fullført"
-
-#: ../calendar/gui/e-cal-component-preview.c:205
-#: ../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/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:310
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:218
-#: ../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/e-cal-component-preview.c:220
-#: ../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/e-cal-component-preview.c:222
-#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1075
-msgid "Low"
-msgstr "Lav"
-
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-itip-control.c:1219
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:65
+#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-itip-control.c:1215 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:366
 msgid "Web Page:"
 msgstr "Nettside:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Created"
 msgstr "Opprettet"
 
@@ -4781,17 +4819,17 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:776
+#: ../calendar/gui/e-calendar-table.c:767
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:777
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-calendar-table.c:768
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4801,7 +4839,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
 #: ../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
@@ -4809,54 +4847,59 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
 #: ../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:522
-#: ../shell/e-shell.c:720
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:836
 msgid "Shell Settings"
 msgstr "Innstillinger for skall"
 
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:523
-#: ../shell/e-shell.c:721
+#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../shell/e-shell.c:837
 msgid "Application-wide settings"
 msgstr "Innstillinger for programmet"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1198
+#: ../calendar/gui/e-itip-control.c:1337
 #: ../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:1224 ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2242
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:975
+#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:961
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1234
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1236
+#: ../calendar/gui/e-cal-model.c:1284
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
+#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2035
+#, c-format
+msgid "Opening %s"
+msgstr "Åpner %s"
+
+#: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
 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>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
+#: ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:297
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -4864,90 +4907,84 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:309
+#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:300
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
-#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
+#: ../calendar/gui/e-calendar-table.c:406 ../calendar/gui/e-memo-table.c:339
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
+#: ../calendar/gui/e-calendar-table.c:424 ../calendar/gui/e-memo-table.c:357
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Udefinert"
-
-#: ../calendar/gui/e-calendar-table.c:746
+#: ../calendar/gui/e-calendar-table.c:737
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:747
+#: ../calendar/gui/e-calendar-table.c:738
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:748
+#: ../calendar/gui/e-calendar-table.c:739
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:749
+#: ../calendar/gui/e-calendar-table.c:740
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:750
+#: ../calendar/gui/e-calendar-table.c:741
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:751
+#: ../calendar/gui/e-calendar-table.c:742
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:752
+#: ../calendar/gui/e-calendar-table.c:743
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:753
+#: ../calendar/gui/e-calendar-table.c:744
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:754
+#: ../calendar/gui/e-calendar-table.c:745
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:755
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:756
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:1973
+#: ../calendar/gui/e-calendar-table.c:855 ../calendar/gui/print.c:2014
 #: ../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:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
-#: ../modules/calendar/e-task-shell-view.c:426
-#: ../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
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:432
+#: ../modules/calendar/e-task-shell-view-actions.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:302
+#: ../modules/calendar/e-task-shell-view.c:439
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:566
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.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
+#: ../calendar/gui/e-calendar-table.c:1097
+#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:883
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1403
-#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
+#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1081
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
@@ -4974,7 +5011,7 @@ msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -4982,67 +5019,56 @@ msgstr "Prioritet"
 msgid "Start date"
 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:1651
-#: ../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-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-list-view.c:566
 #: ../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:1598
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1537
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1599
-#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-calendar-view.c:1538
+#: ../calendar/gui/e-itip-control.c:1193
 #: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2319
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:1600
+#: ../calendar/gui/e-calendar-view.c:1539
 #: ../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
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-calendar-view.c:1540
 #: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1763 ../calendar/gui/print.c:2531
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/print.c:2572
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1733
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -5070,12 +5096,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:750
+#: ../calendar/gui/e-day-view-time-item.c:760
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:781
 msgid "Show the second time zone"
 msgstr "Vis den andre tidssonen"
 
@@ -5085,8 +5111,8 @@ 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:843 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1665
+#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1706
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5096,10 +5122,10 @@ msgstr "%A %d %B"
 #. %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/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:856
+#: ../modules/calendar/e-cal-shell-view-private.c:910
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5108,50 +5134,50 @@ msgstr "%a %d %b"
 #. 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/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:892
+#: ../modules/calendar/e-cal-shell-view-private.c:946
 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:1124 ../calendar/gui/e-week-view.c:510
-#: ../calendar/gui/print.c:824
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/print.c:822
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1127 ../calendar/gui/e-week-view.c:513
-#: ../calendar/gui/print.c:826
+#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/print.c:824
 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:2626
+#: ../calendar/gui/e-day-view.c:2625
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
 
-#: ../calendar/gui/e-itip-control.c:767
+#: ../calendar/gui/e-itip-control.c:766
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
 
-#: ../calendar/gui/e-itip-control.c:784
+#: ../calendar/gui/e-itip-control.c:783
 #, 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:797
+#: ../calendar/gui/e-itip-control.c:796
 #, 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:804
+#: ../calendar/gui/e-itip-control.c:803
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5159,35 +5185,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:815
+#: ../calendar/gui/e-itip-control.c:814
 msgid " and "
 msgstr " og "
 
-#: ../calendar/gui/e-itip-control.c:824
+#: ../calendar/gui/e-itip-control.c:823
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:839
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: ../calendar/gui/e-itip-control.c:851
+#: ../calendar/gui/e-itip-control.c:850
 #, 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:863
+#: ../calendar/gui/e-itip-control.c:862
 #, 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:876
+#: ../calendar/gui/e-itip-control.c:875
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -5195,47 +5221,46 @@ 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:887
+#: ../calendar/gui/e-itip-control.c:886
 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:909
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Starter"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-itip-control.c:917
 msgid "Ends"
 msgstr "Slutter"
 
-#: ../calendar/gui/e-itip-control.c:963
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-itip-control.c:945
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../calendar/gui/e-itip-control.c:1004 ../calendar/gui/e-itip-control.c:1061
+#: ../calendar/gui/e-itip-control.c:988 ../calendar/gui/e-itip-control.c:1049
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1021
+#: ../calendar/gui/e-itip-control.c:1010
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1082 ../calendar/gui/e-itip-control.c:1098
+#: ../calendar/gui/e-itip-control.c:1109 ../calendar/gui/e-itip-control.c:1126
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "En ukjent person"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1134
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5243,315 +5268,309 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#. Location
-#: ../calendar/gui/e-itip-control.c:1173
-#: ../plugins/itip-formatter/itip-view.c:1023
-msgid "Location:"
-msgstr "Sted:"
-
-#: ../calendar/gui/e-itip-control.c:1196
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-itip-control.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1278
 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:1285
+#: ../calendar/gui/e-itip-control.c:1280
 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:1362
+#: ../calendar/gui/e-itip-control.c:1357
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1364
 #, 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:1371
+#: ../calendar/gui/e-itip-control.c:1366
 #, 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:1372
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1373
 #, 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:1379
+#: ../calendar/gui/e-itip-control.c:1374
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1378
 #, 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:1384
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1386
 #, 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:1392
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1394
 #, 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:1400
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Meeting Cancelation"
 msgstr "Møteavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
-#: ../calendar/gui/e-itip-control.c:1527
+#: ../calendar/gui/e-itip-control.c:1405 ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1522
 #, 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:1411
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1433
 #, 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:1439
+#: ../calendar/gui/e-itip-control.c:1434
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1441
 #, 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:1448
+#: ../calendar/gui/e-itip-control.c:1443
 #, 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:1449
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Proposal"
 msgstr "Forslag til oppgave"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1450
 #, 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:1456
+#: ../calendar/gui/e-itip-control.c:1451
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1455
 #, 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:1461
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1463
 #, 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:1469
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Task Cancelation"
 msgstr "Avlysning av oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1483
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1507
 #, 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:1513
+#: ../calendar/gui/e-itip-control.c:1508
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1512
 #, 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:1518
+#: ../calendar/gui/e-itip-control.c:1513
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1517
 #, 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:1523
+#: ../calendar/gui/e-itip-control.c:1518
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1523
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: ../calendar/gui/e-itip-control.c:1604
+#: ../calendar/gui/e-itip-control.c:1599
 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:1663
+#: ../calendar/gui/e-itip-control.c:1658
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: ../calendar/gui/e-itip-control.c:1696
+#: ../calendar/gui/e-itip-control.c:1691
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1734
+#: ../calendar/gui/e-itip-control.c:1729
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: ../calendar/gui/e-itip-control.c:2010
+#: ../calendar/gui/e-itip-control.c:2005
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: ../calendar/gui/e-itip-control.c:2027
+#: ../calendar/gui/e-itip-control.c:2022
 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:2045
+#: ../calendar/gui/e-itip-control.c:2040
 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:2069
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: ../calendar/gui/e-itip-control.c:2076
-#: ../plugins/itip-formatter/itip-formatter.c:1394
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 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:2107 ../calendar/gui/e-itip-control.c:2164
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: ../calendar/gui/e-itip-control.c:2290
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2319
-#: ../calendar/gui/e-meeting-list-view.c:586
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2359
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2383
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2384
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: ../calendar/gui/e-itip-control.c:2385
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2410
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2434
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: ../calendar/gui/e-itip-control.c:2458
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2482
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--til--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "Kalendermelding"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "Dato:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "Laster kalender..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "Tjenermelding:"
 
@@ -5573,49 +5592,49 @@ msgstr "Ressurser"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:971
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../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
+#: ../calendar/gui/print.c:972 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../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
+#: ../calendar/gui/print.c:973
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../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
+#: ../calendar/gui/print.c:974
 msgid "Room"
 msgstr "Rom"
 
 #: ../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
+#: ../calendar/gui/print.c:988
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:989
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: ../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
+#: ../calendar/gui/print.c:990
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: ../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
+#: ../calendar/gui/print.c:991
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
@@ -5626,7 +5645,7 @@ 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:541
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
@@ -5637,7 +5656,7 @@ 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:2272
+#: ../calendar/gui/e-meeting-time-sel.c:2285
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5646,7 +5665,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:2303
+#: ../calendar/gui/e-meeting-time-sel.c:2316
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -5656,67 +5675,67 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "Del_takere..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:609
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:624
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:639
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:657
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:672
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:689
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:762
+#: ../calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:799
+#: ../calendar/gui/e-meeting-time-sel.c:798
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -5744,11 +5763,11 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../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:279
+#: ../calendar/gui/e-memo-table.c:638
+#: ../modules/calendar/e-cal-shell-content.c:461
+#: ../modules/calendar/e-memo-shell-view-actions.c:254
+#: ../modules/calendar/e-memo-shell-view-actions.c:271
+#: ../modules/calendar/e-memo-shell-view.c:292
 msgid "Memos"
 msgstr "Notater"
 
@@ -5763,7 +5782,7 @@ 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
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1687
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5816,8 +5835,8 @@ msgstr "Gå til i dag"
 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
+#: ../calendar/gui/ea-day-view-main-item.c:305
+#: ../calendar/gui/ea-week-view-main-item.c:302
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
@@ -5861,16 +5880,16 @@ msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
 #: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:852
+#: ../modules/calendar/e-cal-shell-view-private.c:906
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../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:859
-#: ../modules/calendar/e-cal-shell-view-private.c:865
-#: ../modules/calendar/e-cal-shell-view-private.c:868
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:922
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -5878,16 +5897,16 @@ msgstr "%a %d %b %Y"
 #: ../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:885
-#: ../modules/calendar/e-cal-shell-view-private.c:896
-#: ../modules/calendar/e-cal-shell-view-private.c:903
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../modules/calendar/e-cal-shell-view-private.c:939
+#: ../modules/calendar/e-cal-shell-view-private.c:950
+#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../modules/calendar/e-cal-shell-view-private.c:960
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:245
 #: ../calendar/gui/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
@@ -5917,49 +5936,68 @@ msgstr "kalendervisning for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:1943
+#: ../calendar/gui/gnome-cal.c:1946
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:2029
-#, c-format
-msgid "Opening %s"
-msgstr "Åpner %s"
+#: ../calendar/gui/gnome-cal.c:2567
+msgid "Purging"
+msgstr "Tømmer"
+
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "April"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "August"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "Desember"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "Februar"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"januar\n"
-"februar\n"
-"mars\n"
-"april\n"
-"mai\n"
-"juni\n"
-"juli\n"
-"august\n"
-"september\n"
-"oktober\n"
-"november\n"
-"desember"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Januar"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "Juli"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "Juni"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "Mars"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Mai"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "November"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Oktober"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Velg dato"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "September"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
@@ -6072,205 +6110,213 @@ msgstr "Ledig/opptatt-informasjon (%s til %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:980
+#: ../calendar/gui/itip-utils.c:829
+msgid "Unable to book a resource, the new event collides with some other."
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:831
+msgid "Unable to book a resource, error: "
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:985
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:590
 msgid "Su"
 msgstr "Sø."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:590
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:590
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:590
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:591
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:591
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:591
 msgid "Sa"
 msgstr "Lø."
 
-#: ../calendar/gui/print.c:2495
+#: ../calendar/gui/print.c:2536
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2497
+#: ../calendar/gui/print.c:2538
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2563
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/print.c:2586
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2626
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2599
+#: ../calendar/gui/print.c:2640
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:2679
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2649
+#: ../calendar/gui/print.c:2690
 msgid "Contacts: "
 msgstr "Kontakter: "
 
@@ -6300,8 +6346,8 @@ msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1821
 msgid "Opening calendar"
 msgstr "Åpner kalender"
 
@@ -6325,11 +6371,11 @@ msgstr "vCalendar-filer (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
@@ -6882,7 +6928,7 @@ msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
@@ -7887,171 +7933,159 @@ msgid "Untitled Message"
 msgstr "Melding uten navn"
 
 #: ../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:616
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:281
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:286
 #: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "Lagre som ut_kast"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:353 ../composer/e-composer-private.c:192
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:202
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:362
-msgid "Insert Send options"
-msgstr "Sett inn alternativer for sending"
-
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "Ny _melding"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "Åpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "T_egnkoding"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:351
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "Krypt_er med PGP"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "_Signer med PGP"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "S_pør om lesekvittering"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "Motta leveringsmelding når meldingen blir lest"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "_Krypter med S/MIME"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "Sig_ner med S/MIME"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ../composer/e-composer-actions.c:465
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
-#: ../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"
 msgstr "Skriv inn mottakerene for meldingen"
@@ -8073,8 +8107,8 @@ msgid "Fr_om:"
 msgstr "Fr_a:"
 
 #: ../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
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "Fra"
@@ -8123,24 +8157,24 @@ msgstr "Klikk her for å få opp adresseboken"
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:218
 msgid "Save draft"
 msgstr "Lagre utkast"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:144
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
+#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:180
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../composer/e-msg-composer.c:900
+#: ../composer/e-msg-composer.c:987
 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:907
+#: ../composer/e-msg-composer.c:994
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8148,11 +8182,15 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2112
+#: ../composer/e-msg-composer.c:1383
+msgid "Unable to reconstruct message from autosave file"
+msgstr "Kunne ikke gjenopprette melding fra automatisk lagret fil"
+
+#: ../composer/e-msg-composer.c:1449 ../composer/e-msg-composer.c:2124
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3320
+#: ../composer/e-msg-composer.c:3354
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8243,22 +8281,10 @@ msgstr ""
 "meldingen vil la deg fortsette der du slapp."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"Alternativer for sending er kun tilgjengelig for Novell GroupWise og "
-"Microsoft Exchange-kontoer."
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "Alternativer for sending er ikke tilgjengelige."
-
-#: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -8266,7 +8292,7 @@ msgstr ""
 "For å legge til innholdet i denne katalogen må du enten legge ved filene "
 "hver for seg eller opprette et arkiv av katalogen og legge ved dette."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -8277,51 +8303,65 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt versjon av gtkhtml og "
 "libgtkhtml."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
 msgstr "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "Uferdige meldinger funnet"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "_Fortsett redigering"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "Ikke _gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "Gjenopp_rett"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "L_agre skisse"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "Varsling om kalenderhendelser"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Evolution varslingstjeneste"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:710
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:255
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Håndter e-post, kontakter og kalender"
 
@@ -8333,6 +8373,44 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (avbrutt)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (fullført)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% fullført)"
+
+#: ../e-util/e-alert.c:94 ../e-util/e-alert.c:95
+msgid "Evolution Error"
+msgstr "Evolution feil"
+
+#: ../e-util/e-alert.c:96 ../e-util/e-alert.c:97
+msgid "Evolution Warning"
+msgstr "Evolution advarsel"
+
+#. setup a dummy alert
+#: ../e-util/e-alert.c:510
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Intern feil, ukjent feil «%s» forespurt"
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arabisk"
@@ -8408,14 +8486,14 @@ msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../plugins/itip-formatter/itip-view.c:194
 #: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow"
 msgstr "I morgen"
 
@@ -8442,32 +8520,26 @@ msgstr "Bruk forvalg for locale"
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
-msgid "Evolution Error"
-msgstr "Evolution feil"
-
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
-msgid "Evolution Warning"
-msgstr "Evolution advarsel"
-
-#: ../e-util/e-error.c:117
-msgid "Evolution Information"
-msgstr "Evolution informasjon"
+#: ../e-util/e-file-utils.c:135
+msgid "(Unknown Filename)"
+msgstr "(Ukjent filnavn)"
 
-#: ../e-util/e-error.c:119
-msgid "Evolution Query"
-msgstr "Evolution spørring"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:139
+#, c-format
+msgid "Writing \"%s\""
+msgstr "Skriver «%s»"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:452
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:144
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Intern feil, ukjent feil «%s» forespurt"
+msgid "Writing \"%s\" to %s"
+msgstr "Skriver «%s» til %s"
 
 #: ../e-util/e-logger.c:172
-#, fuzzy
 msgid "Name of the logger"
-msgstr "Navn på komponenten som logges"
+msgstr "Navn på logger"
 
 #: ../e-util/e-module.c:188
 msgid "Filename"
@@ -8499,54 +8571,44 @@ msgstr "Loggmeldinger:"
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:493
-msgid "Time"
-msgstr "Tid"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2583
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "Feil"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "Feil"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Warning"
-msgstr "Advarsel"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "Advarsler og feil"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../e-util/e-plugin.c:291 ../filter/rule-editor.c:802
-#: ../modules/mail/em-composer-prefs.c:474
+#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:473
 #: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:717
+#: ../plugins/publish-calendar/publish-calendar.c:716
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../e-util/e-plugin.c:292
+#: ../e-util/e-plugin.c:293
 msgid "Whether the plugin is enabled"
 msgstr "Om tillegget er aktivert"
 
@@ -8567,7 +8629,7 @@ msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Fordi «{1}»."
 
@@ -8595,11 +8657,11 @@ msgstr "Overskriv fil?"
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "Kunne ikke åpne lenken."
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
@@ -8612,279 +8674,282 @@ msgstr "GConf-feil: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist på konsollet."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:937
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../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
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2236 ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:2321 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../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
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
+#: ../mail/em-format-html.c:2237 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2324 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../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
+#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2318
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
+#: ../modules/mail/em-mailer-prefs.c:1131
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:429 ../mail/em-composer-utils.c:1135
+#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1229
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../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
+#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:943 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1297
+#: ../em-format/em-format.c:1320
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1335
+#: ../em-format/em-format.c:1375
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1472 ../em-format/em-format.c:1629
+#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1480
+#: ../em-format/em-format.c:1521
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../em-format/em-format.c:1490
+#: ../em-format/em-format.c:1533
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1490
+#: ../em-format/em-format.c:1533
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1648
+#: ../em-format/em-format.c:1699
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1794
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
 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
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
+#: ../em-format/em-format.c:1848
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1925
 msgid "Could not parse PGP message"
 msgstr "Kunne ikke lese PGP-melding"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1925
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunne ikke lese PGP-melding: Ukjent feil"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, 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:81
+#: ../filter/e-filter-datespec.c:71
 #, 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:82
+#: ../filter/e-filter-datespec.c:72
 #, 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:82
+#: ../filter/e-filter-datespec.c:72
 #, 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:83
+#: ../filter/e-filter-datespec.c:73
 #, 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:83
+#: ../filter/e-filter-datespec.c:73
 #, 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:84
+#: ../filter/e-filter-datespec.c:74
 #, 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:84
+#: ../filter/e-filter-datespec.c:74
 #, 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:85
+#: ../filter/e-filter-datespec.c:75
 #, 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:85
+#: ../filter/e-filter-datespec.c:75
 #, 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:86
+#: ../filter/e-filter-datespec.c:76
 #, 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:86
+#: ../filter/e-filter-datespec.c:76
 #, 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:87
+#: ../filter/e-filter-datespec.c:77
 #, 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:87
+#: ../filter/e-filter-datespec.c:77
 #, 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:288
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:442
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
 msgstr "Velg en fil"
 
-#: ../filter/filter-part.c:528
-msgid "Test"
-msgstr "Test"
-
-#: ../filter/filter-rule.c:858
+#: ../filter/e-filter-rule.c:653
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../filter/filter-rule.c:886
+#: ../filter/e-filter-rule.c:682
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppføringer som møter følgende kriterier"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/e-filter-rule.c:716
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/filter-rule.c:926
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "Hvis alle kriterier er møtt"
 
-#: ../filter/filter-rule.c:926
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Hvis noe kriterie er møtt"
 
-#: ../filter/filter-rule.c:928
+#: ../filter/e-filter-rule.c:724
 msgid "_Find items:"
 msgstr "_Finn oppføringer:"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:744
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:744 ../widgets/misc/e-send-options.ui.h:15
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:744
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:744
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../filter/filter-rule.c:948
+#: ../filter/e-filter-rule.c:746
 msgid "I_nclude threads"
 msgstr "Ta _med tråder"
 
-#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:295
+#: ../filter/e-filter-rule.c:1119 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:331
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:296
+#: ../filter/e-filter-rule.c:1119 ../mail/em-utils.c:332
 msgid "Outgoing"
 msgstr "Utgående"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "Legg til regel"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "Rediger regel"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
@@ -8905,7 +8970,7 @@ msgstr "Mangler dato."
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -8929,19 +8994,15 @@ msgstr "Du må gi navn til dette filteret."
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filterregler</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "Sammenligne med"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "Vis filtre for e-post:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -8949,7 +9010,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "12:00 på spesifiserert dato."
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -8957,7 +9018,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "en tid relativ til tiden da filtreringen skjer."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -8965,56 +9026,56 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden da filtreringen skjer."
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"siden\n"
-"i fremtiden"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "_Filterregler"
 
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"sekunder\n"
-"minutter\n"
-"timer\n"
-"dager\n"
-"uker\n"
-"måneder\n"
-"år"
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "et klokkeslett relativt til klokkeslettet nå"
 
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"nåværende klokkeslett\n"
-"klokkeslett du oppgir\n"
-"et klokkeslett relativt til klokkeslettet nå"
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "siden"
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-msgstr "Legg til regel"
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "i fremtiden"
 
-#: ../filter/rule-editor.c:465
-msgid "Edit Rule"
-msgstr "Rediger regel"
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "måneder"
 
-#: ../filter/rule-editor.c:812
-msgid "Rule name"
-msgstr "Regelnavn"
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "sekunder"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "tiden nå"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "tiden du oppgir"
+
+#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:517
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "uker"
 
-#: ../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
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "år"
+
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
+#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
@@ -9031,13 +9092,12 @@ msgid "List View"
 msgstr "Listevisning"
 
 #: ../mail/e-mail-browser.c:663
-#, fuzzy
 msgid "Shell Module"
-msgstr "Utvalgsmodus"
+msgstr "Skallmodul"
 
-#: ../mail/e-mail-browser.c:664 ../mail/message-list.c:2467
+#: ../mail/e-mail-browser.c:664 ../mail/message-list.c:2511
 msgid "The mail shell backend"
-msgstr ""
+msgstr "Skallmotor for e-post"
 
 #: ../mail/e-mail-browser.c:674
 msgid "Show Deleted"
@@ -9047,12 +9107,6 @@ msgstr "Vis slettede"
 msgid "Show deleted messages"
 msgstr "Vis slettede meldinger"
 
-#: ../mail/e-mail-browser.c:710
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:207
-msgid "Evolution"
-msgstr "Evolution"
-
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "Legg til i _adressebok..."
@@ -9098,7 +9152,7 @@ msgid "_Later"
 msgstr "_Senere"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:552
+#: ../modules/mail/e-mail-shell-view-actions.c:545
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -9107,569 +9161,573 @@ msgid "Edit Label"
 msgstr "Rediger etikett"
 
 #: ../mail/e-mail-label-manager.c:349
-#, fuzzy
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
-"Merk: Understrek i etikettnavnet brukes som hurtigtastidentifikator i menyen."
+"Merk: Understrek i etikettnavnet brukes som\n"
+"hurtigtastidentifikator i menyen."
 
 #: ../mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Farge"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:599 ../mail/em-folder-tree.c:2497
-#: ../modules/mail/e-mail-shell-view-private.c:798
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
+#: ../modules/mail/e-mail-shell-view-private.c:903
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:592
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:602
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:604
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:595
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:591
+#: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "Maler"
 
 #. 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:576
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:606
 msgid "Do not ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: ../mail/e-mail-reader.c:215 ../mail/e-mail-reader.c:604
-#: ../mail/em-account-editor.c:667 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-folder-utils.c:392 ../mail/em-vfolder-rule.c:519
-msgid "Select Folder"
-msgstr "Velg mappe"
+#: ../mail/e-mail-reader.c:206 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:387
+#: ../mail/e-mail-reader.c:206 ../mail/em-folder-utils.c:381
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:604 ../mail/em-folder-utils.c:387
+#: ../mail/e-mail-reader.c:583 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
+
+#: ../mail/e-mail-reader.c:583 ../mail/em-folder-utils.c:381
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:1082
+#: ../mail/e-mail-reader.c:811
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Lagre melding"
+msgstr[1] "Lagre meldinger"
+
+#: ../mail/e-mail-reader.c:1093
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1084
+#: ../mail/e-mail-reader.c:1095
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1100
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1091
+#: ../mail/e-mail-reader.c:1102
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1098
+#: ../mail/e-mail-reader.c:1109
 msgid "Copy selected messages to the clipboard"
 msgstr "Kopier valgte meldinger til utklippstavlen"
 
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1114
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/e-mail-reader.c:1105
+#: ../mail/e-mail-reader.c:1116
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1121
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1112
+#: ../mail/e-mail-reader.c:1123
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1128
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1119
+#: ../mail/e-mail-reader.c:1130
 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:1124
+#: ../mail/e-mail-reader.c:1135
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ../mail/e-mail-reader.c:1126
+#: ../mail/e-mail-reader.c:1137
 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:1131
+#: ../mail/e-mail-reader.c:1142
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ../mail/e-mail-reader.c:1133
+#: ../mail/e-mail-reader.c:1144
 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:1138
+#: ../mail/e-mail-reader.c:1149
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ../mail/e-mail-reader.c:1140
+#: ../mail/e-mail-reader.c:1151
 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:1145
+#: ../mail/e-mail-reader.c:1156
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:1147
+#: ../mail/e-mail-reader.c:1158
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1163
 msgid "_Find in Message..."
 msgstr "_Finn i melding..."
 
-#: ../mail/e-mail-reader.c:1154
+#: ../mail/e-mail-reader.c:1165
 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:1159
+#: ../mail/e-mail-reader.c:1170
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1161
+#: ../mail/e-mail-reader.c:1172
 #, 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:1166
+#: ../mail/e-mail-reader.c:1177
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:1168
+#: ../mail/e-mail-reader.c:1179
 #, 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:1173
+#: ../mail/e-mail-reader.c:1184
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ../mail/e-mail-reader.c:1175
-#, fuzzy
+#: ../mail/e-mail-reader.c:1186
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:1180
-#: ../modules/mail/e-mail-attachment-handler.c:134
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: ../mail/e-mail-reader.c:1182
-msgid "Forward the selected message to someone"
-msgstr "Videresend den valgte meldingen til noen"
-
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1191
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1189
+#: ../mail/e-mail-reader.c:1193 ../mail/e-mail-reader.c:1200
 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:1194
+#: ../mail/e-mail-reader.c:1198
+msgid "Forward As _Attached"
+msgstr "Videresend s_om vedlegg"
+
+#: ../mail/e-mail-reader.c:1205
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1196
+#: ../mail/e-mail-reader.c:1207 ../mail/e-mail-reader.c:1214
 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:1201
+#: ../mail/e-mail-reader.c:1212
+#, fuzzy
+msgid "Forward As _Inline"
+msgstr "Videresend s_om"
+
+#: ../mail/e-mail-reader.c:1219
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1203
+#: ../mail/e-mail-reader.c:1221 ../mail/e-mail-reader.c:1228
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1226
+msgid "Forward As _Quoted"
+msgstr "Videresend s_om sitat"
+
+#: ../mail/e-mail-reader.c:1233
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1210
+#: ../mail/e-mail-reader.c:1235
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1240
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1217
+#: ../mail/e-mail-reader.c:1242
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1247
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1224
+#: ../mail/e-mail-reader.c:1249
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1254
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1231
-#, fuzzy
-msgid "Mark the selected messasges as not being junk"
+#: ../mail/e-mail-reader.c:1256
+msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1261
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1238
+#: ../mail/e-mail-reader.c:1263
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1268
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1245
+#: ../mail/e-mail-reader.c:1270
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1275
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1252
+#: ../mail/e-mail-reader.c:1277
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1282
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/e-mail-reader.c:1259
+#: ../mail/e-mail-reader.c:1284
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1289
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1266
+#: ../mail/e-mail-reader.c:1291
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1296
 msgid "_Open in New Window"
 msgstr "_Åpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1273
+#: ../mail/e-mail-reader.c:1298
 msgid "Open the selected messages in a new window"
 msgstr "Åpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1303
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/e-mail-reader.c:1280
+#: ../mail/e-mail-reader.c:1305
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1310
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:1287
+#: ../mail/e-mail-reader.c:1312
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1317
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:1294
+#: ../mail/e-mail-reader.c:1319
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1324
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:1301
+#: ../mail/e-mail-reader.c:1326
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1331
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:1308
+#: ../mail/e-mail-reader.c:1333
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1338
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:1315
+#: ../mail/e-mail-reader.c:1340
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1345
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:1322
+#: ../mail/e-mail-reader.c:1347
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1352
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1329
+#: ../mail/e-mail-reader.c:1354
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1336
+#: ../mail/e-mail-reader.c:1361
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:1343
+#: ../mail/e-mail-reader.c:1368
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1373
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:1350
+#: ../mail/e-mail-reader.c:1375
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:1355
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../mail/e-mail-reader.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:1357
+#: ../mail/e-mail-reader.c:1382
 #, 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:1362
+#: ../mail/e-mail-reader.c:1387
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:1364
+#: ../mail/e-mail-reader.c:1389
 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:1369
+#: ../mail/e-mail-reader.c:1394
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:1371
+#: ../mail/e-mail-reader.c:1396
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1401
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox..."
 
-#: ../mail/e-mail-reader.c:1378
+#: ../mail/e-mail-reader.c:1403
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1408
 msgid "Search Folder from Mailing _List..."
 msgstr "Søkemappe på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1385
-#, fuzzy
+#: ../mail/e-mail-reader.c:1410
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1415
 msgid "Search Folder from Recipien_ts..."
 msgstr "Søkemappe fra mo_ttakere..."
 
-#: ../mail/e-mail-reader.c:1392
-#, fuzzy
+#: ../mail/e-mail-reader.c:1417
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1422
 msgid "Search Folder from Sen_der..."
 msgstr "Søkemappe for avsen_der..."
 
-#: ../mail/e-mail-reader.c:1399
-#, fuzzy
+#: ../mail/e-mail-reader.c:1424
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1429
 msgid "Search Folder from S_ubject..."
 msgstr "Søkemappe for _emne..."
 
-#: ../mail/e-mail-reader.c:1406
-#, fuzzy
+#: ../mail/e-mail-reader.c:1431
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1436
 msgid "Select _All Text"
 msgstr "Marker _all tekst"
 
-#: ../mail/e-mail-reader.c:1413
+#: ../mail/e-mail-reader.c:1438
 msgid "Select all the text in a message"
 msgstr "Marker all tekst i meldingen"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1443
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:1420
+#: ../mail/e-mail-reader.c:1445
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1457
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:1434
+#: ../mail/e-mail-reader.c:1459
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1464
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:1441
+#: ../mail/e-mail-reader.c:1466
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1471
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1473
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1478
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:1455
+#: ../mail/e-mail-reader.c:1480
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:1462
+#: ../mail/e-mail-reader.c:1487
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1494
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:1476
+#: ../mail/e-mail-reader.c:1501
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1508
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../mail/e-mail-reader.c:1490
+#: ../mail/e-mail-reader.c:1515
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1522
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1529
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1558
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/e-mail-reader.c:1533
+#: ../mail/e-mail-reader.c:1566
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1570
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1574
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1578
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:1549
+#: ../mail/e-mail-reader.c:1582
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1586
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:1589
+#: ../mail/e-mail-reader.c:1622
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:1591
+#: ../mail/e-mail-reader.c:1624
 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:1597
+#: ../mail/e-mail-reader.c:1630
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:1599
+#: ../mail/e-mail-reader.c:1632
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1853
 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:2213
+#: ../mail/e-mail-reader.c:2386
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:612
 #: ../plugins/google-account-setup/google-source.c:783
@@ -9677,28 +9735,37 @@ msgstr "Kunne ikke hente ut melding"
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:2358 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:905
-#: ../modules/calendar/e-task-shell-view-actions.c:1105
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../mail/e-mail-reader.c:2505
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "_Videresend"
+
+#: ../mail/e-mail-reader.c:2506
+msgid "Forward the selected message to someone"
+msgstr "Videresend den valgte meldingen til noen"
+
+#: ../mail/e-mail-reader.c:2554 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:979
+#: ../modules/calendar/e-task-shell-view-actions.c:1178
+#: ../plugins/groupwise-features/share-folder.c:754
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:2362
-#: ../modules/calendar/e-cal-shell-view-actions.c:1194
+#: ../mail/e-mail-reader.c:2558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:2366
-#: ../modules/calendar/e-cal-shell-view-actions.c:1187
+#: ../mail/e-mail-reader.c:2562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:2370 ../mail/message-tag-followup.c:62
+#: ../mail/e-mail-reader.c:2566 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Svar"
 
@@ -9751,8 +9818,8 @@ msgstr "Nådde toppen av siden. Fortsatte fra bunnen"
 #. * 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:1555
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1563
 #: ../modules/addressbook/e-book-shell-backend.c:125
 #: ../modules/addressbook/e-book-shell-migrate.c:499
 #: ../modules/calendar/e-cal-shell-backend.c:120
@@ -9761,36 +9828,43 @@ msgstr "Nådde toppen av siden. Fortsatte fra bunnen"
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:110
 #: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2931
+#: ../modules/mail/e-mail-shell-migrate.c:2932
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "Merk for oppfølging"
+
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:486
+#: ../mail/em-account-editor.c:484 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 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:490
+#: ../mail/em-account-editor.c:488 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:19
 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:494
+#: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../mail/em-account-editor.c:587
+#: ../mail/em-account-editor.c:579
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:586
 #, c-format
 msgid ""
 "\n"
@@ -9803,23 +9877,23 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:1002
+#: ../mail/em-account-editor.c:948
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:1003
+#: ../mail/em-account-editor.c:949
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:1004
+#: ../mail/em-account-editor.c:950
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/em-account-editor.c:2084
+#: ../mail/em-account-editor.c:2025
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2085
+#: ../mail/em-account-editor.c:2026
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9829,12 +9903,12 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å begynne."
 
-#: ../mail/em-account-editor.c:2087 ../mail/em-account-editor.c:2213
-#: ../mail/mail-config.glade.h:87
+#: ../mail/em-account-editor.c:2028 ../mail/em-account-editor.c:2164
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:2088
+#: ../mail/em-account-editor.c:2029
 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 "
@@ -9844,20 +9918,20 @@ msgstr ""
 "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
+#: ../mail/em-account-editor.c:2031 ../mail/em-account-editor.c:2201
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2032
 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
+#: ../mail/em-account-editor.c:2034 ../mail/em-account-editor.c:2657
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2035
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9865,25 +9939,23 @@ 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
+#: ../mail/em-account-editor.c:2037
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: ../mail/em-account-editor.c:2097
-#, fuzzy
+#: ../mail/em-account-editor.c:2038
 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."
+"Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
+"Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2042
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2102
-#, fuzzy
+#: ../mail/em-account-editor.c:2043
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9893,64 +9965,61 @@ msgid ""
 msgstr ""
 "Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
 "\n"
-"Du kan nå sende og motta e-post \n"
-"med Evolution.\n"
+"Du kan nå sende og motta e-post med Evolution.\n"
 "\n"
 "Klikk «Bruk» for å lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2526
+#: ../mail/em-account-editor.c:2473
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2534
+#: ../mail/em-account-editor.c:2481
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2776 ../mail/mail-config.glade.h:63
+#: ../mail/em-account-editor.c:2715 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "Forvalg"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:113
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2777 ../mail/mail-config.ui.h:100
 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:2879 ../mail/em-account-editor.c:2947
+#: ../mail/em-account-editor.c:2814 ../mail/em-account-editor.c:2882
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
+#: ../mail/em-account-editor.c:2815 ../mail/em-account-editor.c:2883
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:3407 ../mail/mail-config.glade.h:35
+#: ../mail/em-account-editor.c:3346
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:3407
+#: ../mail/em-account-editor.c:3346
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../mail/em-composer-utils.c:1590
+#: ../mail/em-composer-utils.c:1687
 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:1596
+#: ../mail/em-composer-utils.c:1693
 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:2063
+#: ../mail/em-composer-utils.c:2136
 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:2110
+#: ../mail/em-composer-utils.c:2183
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9958,21 +10027,21 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2253
+#: ../mail/em-composer-utils.c:2327
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2431
+#: ../mail/em-composer-utils.c:2507
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2432
+#: ../mail/em-composer-utils.c:2508
 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"
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "Velg mappe"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10003,10 +10072,6 @@ msgstr "Cc"
 msgid "Completed On"
 msgstr "Fullført"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Kopier til mappe"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Dato mottatt"
@@ -10063,7 +10128,7 @@ msgstr "Følg opp"
 msgid "Forward to"
 msgstr "Videresend til"
 
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:955
+#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
 msgid "Important"
 msgstr "Viktig"
 
@@ -10091,7 +10156,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:88
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "Uønsket e-post"
 
@@ -10131,10 +10196,6 @@ msgstr "Ikke uønsket e-post"
 msgid "Message Location"
 msgstr "Meldingslokasjon"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Send til program"
@@ -10143,8 +10204,8 @@ msgstr "Send til program"
 msgid "Play Sound"
 msgstr "Spill lyd"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "Les"
 
@@ -10259,7 +10320,7 @@ msgid "Quota usage"
 msgstr "Bruk av kvote"
 
 #: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -10277,7 +10338,7 @@ msgstr "Mappe_navn:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:978 ../mail/mail-vfolder.c:1034
+#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
 msgid "Search Folders"
 msgstr "Søkemapper"
 
@@ -10286,16 +10347,16 @@ msgstr "Søkemapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:662 ../mail/em-folder-tree-model.c:998
+#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../mail/em-folder-tree.c:184 ../mail/mail-ops.c:1069
+#: ../mail/em-folder-tree.c:188
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:431
+#: ../mail/em-folder-tree.c:445
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
@@ -10317,37 +10378,37 @@ msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:940
+#: ../mail/em-folder-tree.c:978
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1268
+#: ../mail/em-folder-tree.c:1309
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:1435
+#: ../mail/em-folder-tree.c:1476
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:1437
+#: ../mail/em-folder-tree.c:1478
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1444 ../mail/message-list.c:2052
+#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1446 ../mail/message-list.c:2054
+#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1461
+#: ../mail/em-folder-tree.c:1502
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
@@ -10356,32 +10417,40 @@ msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:513
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:382
+msgid "Move Folder To"
+msgstr "Flytt mappe til"
+
+#: ../mail/em-folder-utils.c:382
+msgid "Copy Folder To"
+msgstr "Kopier mappe til"
+
+#: ../mail/em-folder-utils.c:495
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: ../mail/em-folder-utils.c:675
+#: ../mail/em-folder-utils.c:657
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:676
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:658
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-utils.c:692
+#: ../mail/em-folder-utils.c:674
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1453
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1536
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10389,11 +10458,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1454
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1537
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10401,11 +10470,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1455
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1538
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10413,11 +10482,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:111 ../mail/em-format-html.c:1456
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1539
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10425,11 +10494,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:112 ../mail/em-format-html.c:1457
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1540
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
-#: ../mail/em-format-html-display.c:112
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10437,11 +10506,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:119 ../mail/em-format-html.c:1463
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1546
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:119
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10449,11 +10518,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:120 ../mail/em-format-html.c:1464
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1547
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:120
+#: ../mail/em-format-html-display.c:115
 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 "
@@ -10463,11 +10532,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:121 ../mail/em-format-html.c:1465
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1548
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:121
+#: ../mail/em-format-html-display.c:116
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10475,11 +10544,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:122 ../mail/em-format-html.c:1466
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1549
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:122
+#: ../mail/em-format-html-display.c:117
 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 "
@@ -10488,15 +10557,15 @@ 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:259 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:274
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:525
+#: ../mail/em-format-html-display.c:509
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10504,28 +10573,28 @@ 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
+#: ../mail/em-format-html-display.c:730
 msgid "Completed on"
 msgstr "Fullført"
 
-#: ../mail/em-format-html-display.c:803
+#: ../mail/em-format-html-display.c:738
 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:807
+#: ../mail/em-format-html-display.c:742
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:1204 ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:1206
+#: ../mail/em-format-html-display.c:928
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1263
+#: ../mail/em-format-html-display.c:985
 msgid "O_pen With"
 msgstr "Å_pne med"
 
@@ -10538,44 +10607,44 @@ msgstr "Side %d av %d"
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:342
+#: ../mail/em-format-html.c:356
 msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
-#: ../mail/em-format-html.c:1304 ../mail/em-format-html.c:1313
+#: ../mail/em-format-html.c:1387 ../mail/em-format-html.c:1396
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:1759
+#: ../mail/em-format-html.c:1848
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1856
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:1797
+#: ../mail/em-format-html.c:1886
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:1808
+#: ../mail/em-format-html.c:1897
 #, 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:1810
+#: ../mail/em-format-html.c:1899
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1831
+#: ../mail/em-format-html.c:1920
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1842
+#: ../mail/em-format-html.c:1931
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
@@ -10583,63 +10652,54 @@ msgstr "Peker til ukjente eksterne data («%s»-type)"
 #. 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:2483
+#: ../mail/em-format-html.c:2589
 #, 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-subscribe-editor.c:607
+#: ../mail/em-subscribe-editor.c:597
 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:640
+#: ../mail/em-subscribe-editor.c:630
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: ../mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:634
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:846
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: ../mail/em-subscribe-editor.c:896
+#: ../mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:341
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:357
-msgid "message"
-msgstr "melding"
-
-#: ../mail/em-utils.c:645
-msgid "Save Message..."
-msgstr "Lagre melding..."
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1108
+#: ../mail/em-utils.c:845
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "Søke_mapper"
 
-#: ../mail/em-vfolder-rule.c:596
-msgid "Search Folder source"
-msgstr "Kilde for søke_mappe"
+#: ../mail/em-vfolder-rule.c:521
+msgid "Add Folder"
+msgstr "Legg til mappe"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Filter Editor\" window height"
-msgstr "Forvalgt vinduhøyde"
+msgstr "Vinduhøyde for «Filterredigering»"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 #, fuzzy
@@ -10870,26 +10930,31 @@ 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:49
+#, fuzzy
+msgid "Do not add signature delimiter"
+msgstr "Kunne ikke lagre signaturfil."
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 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:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 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:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10897,32 +10962,32 @@ msgstr ""
 "Slå på animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
 "bilder er plagsomme og foretrekker å se et statisk bilde i stedet."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 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:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 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:58
+#: ../mail/evolution-mail.schemas.in.h:59
 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:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "Aktiver søkemapper"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "Aktiver søkemapper ved oppstart."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10930,7 +10995,7 @@ msgstr ""
 "Slår på søkefunksjonen for sidelinjen for å muliggjøre interaktive søk etter "
 "mappenavn."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10938,19 +11003,19 @@ msgstr ""
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 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:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:65 ../mail/mail-config.glade.h:74
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 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, "
@@ -10958,19 +11023,19 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../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:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 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:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10978,7 +11043,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:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10989,7 +11054,7 @@ msgstr ""
 "enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
 "visnin."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 #, fuzzy
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
@@ -10998,7 +11063,7 @@ msgstr ""
 "Initiell høyde for «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 #, fuzzy
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
@@ -11007,7 +11072,7 @@ msgstr ""
 "Initiell høyde for «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11015,7 +11080,7 @@ msgstr ""
 "Initiell høyde for «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11023,7 +11088,7 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11031,7 +11096,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11040,7 +11105,7 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 #, fuzzy
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
@@ -11049,7 +11114,7 @@ msgstr ""
 "Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 #, fuzzy
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
@@ -11058,7 +11123,7 @@ msgstr ""
 "Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11066,14 +11131,6 @@ msgstr ""
 "Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../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."
-msgstr ""
-"Aktiver/deaktiver funksjonen hvor gjentatte spørsmål stilles om frakoblet "
-"synkronisering kreves."
-
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
@@ -11093,9 +11150,8 @@ msgid "Last time empty trash was run"
 msgstr "Sist gang papirkurven ble tømt"
 
 #: ../mail/evolution-mail.schemas.in.h:85
-#, fuzzy
 msgid "Layout style"
-msgstr "Utf_orming"
+msgstr "Stil for utforming"
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
@@ -11246,26 +11302,22 @@ msgid ""
 msgstr "Stopp og spør når en en e-post uten emne skal bli sendt."
 
 #: ../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: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:120
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:121
 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:123
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11273,63 +11325,69 @@ 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:124
+#: ../mail/evolution-mail.schemas.in.h:123
 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:125
+#: ../mail/evolution-mail.schemas.in.h:124
 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:126
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer på toppen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markør ved bunnen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
 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:130
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uønsket."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:132
 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:134
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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:136
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis «Bcc» feltet når meldinger sendes"
@@ -11359,9 +11417,8 @@ msgid "Show Animations"
 msgstr "Vis animasjoner"
 
 #: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
 msgid "Show all message headers"
-msgstr "Slå sammen alle meldingstråder"
+msgstr "Vis alle meldingshoder"
 
 #: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
@@ -11385,10 +11442,14 @@ msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
 #: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11396,7 +11457,7 @@ msgstr ""
 "Vis «Bcc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11404,7 +11465,7 @@ msgstr ""
 "Vis «Cc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen når "
 "en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11412,7 +11473,7 @@ msgstr ""
 "Vis «Fra»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11420,15 +11481,15 @@ msgstr ""
 "Vis «Fra»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show the \"Preview\" pane"
 msgstr "Vis forhåndsvisningsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show the \"Preview\" pane."
 msgstr "Vis forhåndsvisningsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11436,7 +11497,7 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11444,57 +11505,64 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-"
 "menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 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:161
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
 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:162
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Spell checking languages"
 msgstr "Språk for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt høyde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde på abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Text message part limit"
 msgstr "Grense for tekstdel av melding"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 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:171
+#: ../mail/evolution-mail.schemas.in.h:173
 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:172
+#: ../mail/evolution-mail.schemas.in.h:174
 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 "
@@ -11502,15 +11570,15 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11518,7 +11586,7 @@ msgstr ""
 "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
 "feilsøkingsmeldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -11526,7 +11594,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:177
+#: ../mail/evolution-mail.schemas.in.h:179
 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 "
@@ -11536,7 +11604,7 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 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."
@@ -11545,7 +11613,7 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
 "den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 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;"
@@ -11557,18 +11625,18 @@ msgstr ""
 "&lt;header enabled&gt; - sett «enabled» hvis toppteksten skal vises i e-"
 "postvisningen. "
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 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:181
+#: ../mail/evolution-mail.schemas.in.h:183
 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:182
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11576,7 +11644,7 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «...»."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11584,7 +11652,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:184
+#: ../mail/evolution-mail.schemas.in.h:186
 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 "
@@ -11594,87 +11662,87 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message list."
 msgstr "Bruk meldingsliste med tråder."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Thread the message-list"
 msgstr "Bruk meldingsliste med tråder"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Thread the message-list based on Subject"
 msgstr "Lag tråder av e-postlisten basert på emne"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgrense for å merke e-post som sett"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Timeout for marking message as seen."
 msgstr "Tidsavbrydd å merke e-poster som sett."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farge for understreking av feilstavede ord ved bruk av stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 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:198
+#: ../mail/evolution-mail.schemas.in.h:200
 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:199
+#: ../mail/evolution-mail.schemas.in.h:201
 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:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 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:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11682,571 +11750,542 @@ msgstr ""
 "Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 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:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 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:481
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+#: ../mail/importers/elm-importer.c:323 ../mail/importers/pine-importer.c:377
+#: ../modules/mail/e-mail-shell-view.c:589
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "E-post"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:363
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:364
 msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../plugins/pst-import/pst-importer.c:310
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:258
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
-#: ../mail/importers/mail-importer.c:131
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
-#: ../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
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: ../mail/importers/mail-importer.c:358
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:224
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:383
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../mail/importers/pine-importer.c:382
+#: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:423
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:424
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
-#: ../mail/mail-autofilter.c:71
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:257
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:292
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:365
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types"
-msgstr "Sj_ekk støttede typer"
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(NB! Krever omstart av programmet)"
 
-#: ../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:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>Bilde av avsender</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>Sig_naturer</b> "
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Alternativ for topp-posting</b> (Ikke anbefalt)"
 
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b>S_pråk</b> "
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">Autentisering</span>"
-
-#: ../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:13
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">Konfigurasjon</span>"
-
-#: ../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:16
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Sletting av e-post</span>"
-
-#: ../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:19
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Etiketter</span>"
-
-#: ../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:21
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Meldingsvisning</span>"
-
-#: ../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:23
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Kvitteringer for meldinger</span>"
-
-#: ../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:25
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">Alternativer</span>"
-
-#: ../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:27
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
-
-#: ../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:29
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
-
-#: ../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:31
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">Sikkerhet</span>"
-
-#: ../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:33
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
-
-#: ../mail/mail-config.glade.h:34
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">_Autentiseringstype</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "Kontoinformasjon"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.ui.h:5
 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:38
+#: ../mail/mail-config.ui.h:7
 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:39
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:10
 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:42
+#: ../mail/mail-config.ui.h:11
 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:43
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
-#: ../mail/mail-config.glade.h:44
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"Vedlegg\n"
-"I meldingen\n"
-"Sitert"
-
-#: ../mail/mail-config.glade.h:47
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"Vedlegg\n"
-"I meldingen (som Outlook)\n"
-"Sitert\n"
-"Ikke siter"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "Autentisering"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.glade.h:53
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende e-post er uønsket"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "Skriver meldinger"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "Forvalgt oppførsel"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "Slett e-post"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr "Viste meldings_hoder"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ikke formater meldinger når st_ørrelsen overstiger"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.ui.h:38
 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:69
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "Ikke siter"
+
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "Aktiver magi_sk mellomromtast"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "Aktiver søkemappe_r"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.ui.h:59
+msgid "Inline"
+msgstr "I meldingen"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "I meldingen (som i Outlook)"
+
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:90 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "Laster bilder"
+
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../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
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Message Composer"
-msgstr "Meldingsredigering"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "Meldingsvisning"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "Skrift for melding"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Meldingsmottakere"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:73
 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:98
+#: ../mail/mail-config.ui.h:74
 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:99
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "Valgfri informasjon"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.ui.h:82
 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:105
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:85
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Skriv ut valgte kontakter"
+
+#: ../mail/mail-config.ui.h:86
+#, fuzzy
+msgid "Proxy Settings"
+msgstr "Innstillinger for uønsket e-post"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "Sitert"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "Nødvendig informasjon"
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr "SSL er ikke støttet i denne versjonen av Evolution  "
+
+#: ../mail/mail-config.ui.h:95
 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:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "Sikker MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "Velg mappe for skisser"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:103
 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:116
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:105
 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:118
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "Velg mappe for sendte meldinger"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr "Bilde av avsender"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr "Sendte meldinger og skisser"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "Tjenerkonfigurasjon"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "Sig_naturer"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12254,7 +12293,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:123
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -12264,7 +12303,7 @@ 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:132
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12272,209 +12311,244 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.glade.h:136 ../plugins/caldav/caldav-source.c:405
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:405
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/google-account-setup/google-source.c:700
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "_Autentiseringstype"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "_Språk"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:149
 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:154
+#: ../mail/mail-config.ui.h:150
 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:155
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../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
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Tj_ener:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:158
 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:163
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:49
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:50
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-config.glade.h:172
-msgid "seconds"
-msgstr " sekunder"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Kilder for søkemapper</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digital signatur</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Kryptering</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "Alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "Alle lokale mapper"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "Ring"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "Merk for oppfølging"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "Digital signatur"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "Ikke videresend"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "Følg opp"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "Til din informasjon"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "Videresend"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "Ingen respons nødvendig"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "Gjennomgå"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr "Kilder for søkemapper"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12482,23 +12556,23 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:872
+#: ../mail/mail-folder-cache.c:890
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -12512,12 +12586,12 @@ msgid "Fetching Mail"
 msgstr "Henter e-post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:600
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:605
+#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:639
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12526,123 +12600,131 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:656
 #, 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:730 ../mail/mail-ops.c:811
+#: ../mail/mail-ops.c:767 ../mail/mail-ops.c:848
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/mail-ops.c:740
+#: ../mail/mail-ops.c:777
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:767
+#: ../mail/mail-ops.c:804
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:769 ../mail/mail-send-recv.c:717
+#: ../mail/mail-ops.c:806 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:771 ../mail/mail-send-recv.c:719
+#: ../mail/mail-ops.c:808 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:883
-msgid "Saving message to folder"
-msgstr "Lagrer melding til mappe"
+#: ../mail/mail-ops.c:920
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Lagrer melding til mappe «%s»"
 
-#: ../mail/mail-ops.c:960
+#: ../mail/mail-ops.c:997
 #, c-format
-msgid "Moving messages to %s"
-msgstr "Flytter melding(er) til %s"
+msgid "Moving messages to '%s'"
+msgstr "Flytter meldinger til «%s»"
 
-#: ../mail/mail-ops.c:960
+#: ../mail/mail-ops.c:997
 #, c-format
-msgid "Copying messages to %s"
-msgstr "Kopierer meldinger til %s"
+msgid "Copying messages to '%s'"
+msgstr "Kopierer meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1106
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "Skanner mapper i «%s»"
+
+#: ../mail/mail-ops.c:1214
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1218
+#: ../mail/mail-ops.c:1255
 #, c-format
-msgid "Opening folder %s"
-msgstr "Åpner mappe %s"
+msgid "Opening folder '%s'"
+msgstr "Åpner mappe «%s»"
 
-#: ../mail/mail-ops.c:1284
+#: ../mail/mail-ops.c:1321
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "Henter kvoteinformasjon for mappe %s"
+msgid "Retrieving quota information for folder '%s'"
+msgstr "Henter kvoteinformasjon for mappe «%s»"
 
-#: ../mail/mail-ops.c:1356
+#: ../mail/mail-ops.c:1393
 #, c-format
-msgid "Opening store %s"
-msgstr "Åpner lager %s"
+msgid "Opening store '%s'"
+msgstr "Åpner lager «%s»"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1464
 #, c-format
-msgid "Removing folder %s"
-msgstr "Fjerner mappe %s"
+msgid "Removing folder '%s'"
+msgstr "Fjerner mappe «%s»"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1582
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1608
+#: ../mail/mail-ops.c:1645
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1663
-msgid "Refreshing folder"
-msgstr "Oppdaterer mappe"
+#: ../mail/mail-ops.c:1700
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Oppdaterer mappe «%s»"
 
-#: ../mail/mail-ops.c:1703 ../mail/mail-ops.c:1753
-msgid "Expunging folder"
-msgstr "Tømmer mappe"
+#: ../mail/mail-ops.c:1740
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Tømmer mappe «%s»"
 
-#: ../mail/mail-ops.c:1750
+#: ../mail/mail-ops.c:1785
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1751
+#: ../mail/mail-ops.c:1786
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1832
+#: ../mail/mail-ops.c:1864
 #, c-format
-msgid "Retrieving message %s"
-msgstr "Henter melding %s"
+msgid "Retrieving message '%s'"
+msgstr "Henter melding «%s»"
 
-#: ../mail/mail-ops.c:1941
+#: ../mail/mail-ops.c:1982
 #, 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:2026
+#: ../mail/mail-ops.c:2071
 #, 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:2106
+#: ../mail/mail-ops.c:2151
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12651,11 +12733,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2178
+#: ../mail/mail-ops.c:2223
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2196 ../mail/mail-ops.c:2204
+#: ../mail/mail-ops.c:2241 ../mail/mail-ops.c:2249
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12664,122 +12746,121 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2264
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2364
+#: ../mail/mail-ops.c:2409
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "Kobler fra %s"
+msgid "Disconnecting from '%s'"
+msgstr "Kobler fra «%s»"
 
-#: ../mail/mail-ops.c:2364
+#: ../mail/mail-ops.c:2409
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "Kobler til %s på nytt"
+msgid "Reconnecting to '%s'"
+msgstr "Kobler til «%s» på nytt"
 
-#: ../mail/mail-ops.c:2460
+#: ../mail/mail-ops.c:2505
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2546
+#: ../mail/mail-ops.c:2591
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: ../mail/mail-send-recv.c:186
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Avbryter..."
 
-#: ../mail/mail-send-recv.c:392
+#: ../mail/mail-send-recv.c:432
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:405
+#: ../mail/mail-send-recv.c:445
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:514
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: ../mail/mail-send-recv.c:514 ../mail/mail-send-recv.c:591
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../mail/mail-send-recv.c:830
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:219
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:221
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:263
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/mail-tools.c:122
+#: ../mail/mail-tools.c:136
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../mail/mail-tools.c:152
+#: ../mail/mail-tools.c:166
 #, 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:258
+#: ../mail/mail-tools.c:272
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../mail/mail-tools.c:260
+#: ../mail/mail-tools.c:274
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-tools.c:300
+#: ../mail/mail-tools.c:314
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: ../mail/mail-vfolder.c:92
+#: ../mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkemappe: %s"
 
-#: ../mail/mail-vfolder.c:237
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Oppdaterer søkemapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:244
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkemapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1085
+#: ../mail/mail-vfolder.c:1075
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1183
+#: ../mail/mail-vfolder.c:1168
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
@@ -12868,74 +12949,82 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
 #: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "Er du sikker på at du vil sende en melding med ugyldig adresse?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "Er du sikker på at du vil sende en melding med ugyldige adresser?"
+
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "Fordi «{0}»."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "Fordi «{2}»."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Tom signatur"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Kan ikke legge til søkemappe «{0}»."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "Kan ikke opprette midlertidig katalog."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikke opprette katalog for lagring fordi «{1}»"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kunne ikke slette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere søkemappe «{0}» da den ikke eksisterer."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "Kan ikke åpne kilde «{1}»"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -12943,35 +13032,35 @@ msgstr ""
 "Kan ikke lese lisensfil «{0}» pga et installasjonsproblem. Du vil ikke kunne "
 "bruke denne tilbyderen før du har mulighet til å godta lisensen."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn på «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "Kan ikke lagre til fil «{0}»."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Kan ikke sette signaturskript «{0}»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "Sjekk etter uønsket e-post feilet"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -12979,85 +13068,69 @@ msgstr ""
 "Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
 "mellom store og små bokstaver. Caps lock kan være på."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "Kunne ikke lagre signaturfil."
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "Slett «{0}»?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "Slett konto?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Slett meldinger i søkemappe «{0}»?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "Slett meldinger i søkemappen?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "Forkast endringer?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ikke sl_ett"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "Ikke slett"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "Ikke deaktiver"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Feil under utføring av operasjon."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13065,11 +13138,11 @@ msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13077,11 +13150,11 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13089,23 +13162,23 @@ msgstr ""
 "Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
 "igjen."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13117,31 +13190,27 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "Merk alle meldinger som lest"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13149,7 +13218,7 @@ msgstr ""
 "Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
 "postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13158,63 +13227,59 @@ msgstr ""
 "Sjekk at følgende mottakere kan og ønsker å motta e-post som HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "Spør tjener"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Lesekvittering etterspurt."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen «{0}» og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:86
 msgid "Report Junk Failed"
 msgstr "Feil under rapportering av uønsket e-post"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:87
 msgid "Report Not Junk Failed"
 msgstr "Feil under rapportering av e-post som ønsket"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:88
 msgid "Search Folders automatically updated."
 msgstr "Søkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:89
 msgid "Send Receipt"
 msgstr "Send kvittering"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:91
 msgid "Synchronize"
 msgstr "Synkroniser"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13222,7 +13287,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn på, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13238,7 +13303,7 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13252,7 +13317,7 @@ msgstr ""
 "    «{1}»\n"
 "og er nå oppdatert."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13266,6 +13331,18 @@ msgstr ""
 "    «{1}»\n"
 "og er nå oppdatert."
 
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
@@ -13394,6 +13471,7 @@ msgid "_Do not Synchronize"
 msgstr "I_kke synkroniser"
 
 #: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:1003
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
@@ -13405,82 +13483,82 @@ msgstr "T_øm"
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1068
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1069
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1070
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1071
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1072
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1073
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1077
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1074
+#: ../mail/message-list.c:1078
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1082
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1079
+#: ../mail/message-list.c:1083
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1688 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1695 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1704
+#: ../mail/message-list.c:1728
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1716
+#: ../mail/message-list.c:1740
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1724
+#: ../mail/message-list.c:1748
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1726
+#: ../mail/message-list.c:1750
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2466 ../shell/e-shell-view.c:534
+#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
 msgid "Shell Backend"
 msgstr ""
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4054 ../mail/message-list.c:4528
+#: ../mail/message-list.c:4254 ../mail/message-list.c:4734
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4365
+#: ../mail/message-list.c:4569
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13488,7 +13566,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:4367
+#: ../mail/message-list.c:4571
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -13496,7 +13574,7 @@ msgstr ""
 "Det finnes kun skjulte meldinger i denne mappen. Bruk Vis->Vis skjulte "
 "meldinger for å vise dem."
 
-#: ../mail/message-list.c:4369
+#: ../mail/message-list.c:4573
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -13525,7 +13603,6 @@ msgid "Sent Messages"
 msgstr "Sendte meldinger"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Størrelse"
@@ -13534,60 +13611,28 @@ msgstr "Størrelse"
 msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "Ring"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "Ikke videresend"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "Følg opp"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "Til din informasjon"
-
-#: ../mail/message-tag-followup.c:58
-msgid "Forward"
-msgstr "Videresend"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "Ingen respons nødvendig"
-
-#: ../mail/message-tag-followup.c:63
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "Gjennomgå"
-
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1457
+#: ../modules/mail/e-mail-shell-view-actions.c:1414
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1428
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
@@ -13595,7 +13640,7 @@ msgstr "Emne inneholder"
 msgid "Subject or Addresses contains"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/addressbook/addressbook-config.c:212
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13603,7 +13648,7 @@ 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
+#: ../modules/addressbook/addressbook-config.c:208
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13611,7 +13656,7 @@ 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
+#: ../modules/addressbook/addressbook-config.c:210
 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 "
@@ -13621,15 +13666,16 @@ msgstr ""
 "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:592
+#, fuzzy
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "Fødselsdager og jubileum"
 
-#: ../modules/addressbook/addressbook-config.c:643
+#: ../modules/addressbook/addressbook-config.c:628
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 
-#: ../modules/addressbook/addressbook-config.c:754
+#: ../modules/addressbook/addressbook-config.c:736
 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 "
@@ -13639,7 +13685,7 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken port "
 "du skal bruke."
 
-#: ../modules/addressbook/addressbook-config.c:832
+#: ../modules/addressbook/addressbook-config.c:810
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13648,7 +13694,7 @@ 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
+#: ../modules/addressbook/addressbook-config.c:885
 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 "
@@ -13660,34 +13706,28 @@ msgstr ""
 "søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
 "basen."
 
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:991
 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
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:997
 msgid "Searching"
 msgstr "Søker"
 
-#: ../modules/addressbook/addressbook-config.c:1028
+#: ../modules/addressbook/addressbook-config.c:999
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../modules/addressbook/addressbook-config.c:1238
-#: ../modules/addressbook/ldap-config.glade.h:9
+#: ../modules/addressbook/addressbook-config.c:1205
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: ../modules/addressbook/addressbook-config.c:1240
+#: ../modules/addressbook/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
@@ -13768,12 +13808,7 @@ msgstr ""
 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:"
 
@@ -13797,16 +13832,17 @@ msgid "_Contact"
 msgstr "_Kontakt"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
 #: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
@@ -13816,62 +13852,57 @@ msgid "Address _Book"
 msgstr "Adresse_bok"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:619
+#: ../modules/addressbook/e-book-shell-view-actions.c:730
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:396
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../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:595
-#: ../modules/calendar/e-cal-shell-backend.c:758
-#: ../modules/calendar/e-memo-shell-backend.c:582
-#: ../modules/calendar/e-task-shell-backend.c:592
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:759
+#: ../modules/calendar/e-memo-shell-backend.c:583
+#: ../modules/calendar/e-task-shell-backend.c:593
 msgid "Source List"
-msgstr "Kilde"
+msgstr "Kildeliste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-backend.c:597
 msgid "The registry of address books"
-msgstr "Kunne ikke hente liste med adressebøker"
+msgstr "Register med adressebøker"
 
-#: ../modules/addressbook/e-book-shell-content.c:313
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-content.c:380
 msgid "Current View"
-msgstr "_Aktiv visning"
+msgstr "Aktiv visning"
 
-#: ../modules/addressbook/e-book-shell-content.c:314
+#: ../modules/addressbook/e-book-shell-content.c:381
 msgid "The currently selected address book view"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-content.c:323
+#: ../modules/addressbook/e-book-shell-content.c:390
 msgid "Previewed Contact"
 msgstr "Forhåndsvist kontakt"
 
-#: ../modules/addressbook/e-book-shell-content.c:324
+#: ../modules/addressbook/e-book-shell-content.c:391
 #, 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:607
-#: ../modules/calendar/e-task-shell-content.c:630
-#: ../modules/mail/e-mail-shell-content.c:716
+#: ../modules/addressbook/e-book-shell-content.c:400
+#: ../modules/calendar/e-memo-shell-content.c:611
+#: ../modules/calendar/e-task-shell-content.c:634
+#: ../modules/mail/e-mail-shell-content.c:730
 msgid "Preview is Visible"
 msgstr "Forhåndsvisning er synlig"
 
-#: ../modules/addressbook/e-book-shell-content.c:334
-#: ../modules/calendar/e-memo-shell-content.c:608
-#: ../modules/calendar/e-task-shell-content.c:631
-#: ../modules/mail/e-mail-shell-content.c:717
+#: ../modules/addressbook/e-book-shell-content.c:401
+#: ../modules/calendar/e-memo-shell-content.c:612
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:731
 #, fuzzy
 msgid "Whether the preview pane is visible"
 msgstr "Om forhåndsvisningsområdet skal vises."
@@ -13879,14 +13910,14 @@ 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
+#: ../modules/mail/e-mail-shell-migrate.c:1106
 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
+#: ../modules/mail/e-mail-shell-migrate.c:1179
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Flytter «%s»:"
@@ -13941,375 +13972,357 @@ msgstr ""
 "\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
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:608
+#: ../modules/calendar/e-memo-shell-sidebar.c:543
+#: ../modules/calendar/e-task-shell-sidebar.c:541
 #, fuzzy
 msgid "Source Selector Widget"
 msgstr "Valgt av notatkilde"
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:174
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
 #, 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:596
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:563
+msgid "Save as vCard"
+msgstr "Lagre som vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pier alle kontakter til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:598
+#: ../modules/addressbook/e-book-shell-view-actions.c:709
 #, 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:603
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
 msgid "Del_ete Address Book"
 msgstr "Sl_ett adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:605
+#: ../modules/addressbook/e-book-shell-view-actions.c:716
 msgid "Delete the selected address book"
 msgstr "Slett valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:610
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
 msgid "Mo_ve All Contacts To..."
 msgstr "Fl_ytt alle kontakter til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:612
+#: ../modules/addressbook/e-book-shell-view-actions.c:723
 #, 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:617
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:624
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
 msgid "Address _Book Properties"
 msgstr "Egenskaper for adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:626
+#: ../modules/addressbook/e-book-shell-view-actions.c:737
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "Endre egenskaper for valgt mappe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:631
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:756
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:633
+#: ../modules/addressbook/e-book-shell-view-actions.c:744
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "Endre navn på valgt mappe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:638
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
 #, fuzzy
 msgid "S_ave Address Book as vCard"
 msgstr "L_agre adressebok som VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:640
+#: ../modules/addressbook/e-book-shell-view-actions.c:751
 #, 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:647
+#: ../modules/addressbook/e-book-shell-view-actions.c:758
 msgid "Stop loading"
 msgstr "Stopp lasting"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:654
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:661
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:668
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/addressbook/e-book-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
 msgid "_Copy Contact To..."
 msgstr "_Kopier kontakt til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:675
+#: ../modules/addressbook/e-book-shell-view-actions.c:786
 msgid "Copy selected contacts to another address book"
 msgstr "Kopier valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
 msgid "_Delete Contact"
 msgstr "_Slett kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:793
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:800
 msgid "Send selected contacts to another person"
 msgstr "Send valgte kontakter til en annen person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Move Contact To..."
 msgstr "_Flytt kontakt til..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
 msgid "Move selected contacts to another address book"
 msgstr "Flytt valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-msgid "_Open"
-msgstr "_Åpne"
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "_Open Contact"
+msgstr "_Åpne kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save selected contacts as a vCard"
-msgstr "Lagre valgte kontakter som et vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
-#: ../modules/calendar/e-task-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:848
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
-#: ../modules/calendar/e-memo-shell-view-actions.c:675
-#: ../modules/calendar/e-task-shell-view-actions.c:828
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/calendar/e-memo-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "Contact _Preview"
 msgstr "_Forhåndsvisning av kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhåndsvisning av kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:1360
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:933
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 #, 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:859
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-memo-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:977
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
-#: ../modules/calendar/e-memo-shell-view-actions.c:785
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-msgid "Print selected contacts"
-msgstr "Skriv ut valgte kontakter"
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
+msgid "Advanced search"
+msgstr "Avansert søk"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+msgid "Print all shown contacts"
+msgstr "Skriv ut alle viste kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
-#: ../modules/addressbook/e-book-shell-view.c:322
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+msgid "Print selected contacts"
+msgstr "Skriv ut valgte kontakter"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+msgid "Save as vCard..."
+msgstr "Lagre som vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1040
+msgid "Save selected contacts as a vCard"
+msgstr "Lagre valgte kontakter som et vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:336
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:324
+#: ../modules/addressbook/e-book-shell-view.c:338
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:355
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "_Send Message to Contacts"
-msgstr "Send _melding til kontakter"
+msgstr "_Send melding til kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:357
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to List"
-msgstr "Send _melding til liste"
+msgstr "_Send melding til liste"
 
-#: ../modules/addressbook/e-book-shell-view.c:359
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to Contact"
-msgstr "Send _melding til kontakt"
+msgstr "_Send melding til kontakt"
 
-#: ../modules/addressbook/eab-composer-util.c:139
+#: ../modules/addressbook/eab-composer-util.c:137
 msgid "Multiple vCards"
 msgstr "Flere vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:145
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../modules/addressbook/eab-composer-util.c:159
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: ../modules/addressbook/eab-composer-util.c:188
+#: ../modules/addressbook/eab-composer-util.c:186
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
 
-#: ../modules/addressbook/ldap-config.glade.h:1
+#: ../modules/addressbook/ldap-config.ui.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.ui.h:2
+msgid "3268"
+msgstr "3268"
 
-#: ../modules/addressbook/ldap-config.glade.h:5
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr "389"
+
+#: ../modules/addressbook/ldap-config.ui.h:4
 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.ui.h:5
+msgid "636"
+msgstr "636"
 
-#: ../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)"
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Anonymously"
+msgstr "Anonymt"
 
 #. 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
+#: ../modules/addressbook/ldap-config.ui.h:8
 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
+#: ../modules/addressbook/ldap-config.ui.h:9
 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.ui.h:11
+msgid "One"
+msgstr "En"
 
-#: ../modules/addressbook/ldap-config.glade.h:24
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Søkefilter"
 
-#: ../modules/addressbook/ldap-config.glade.h:25
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Søke_base:"
 
-#: ../modules/addressbook/ldap-config.glade.h:26
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "Søke_filter:"
 
-#: ../modules/addressbook/ldap-config.glade.h:27
+#: ../modules/addressbook/ldap-config.ui.h:16
 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\"."
@@ -14317,71 +14330,51 @@ 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
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Sub"
+msgstr "Sub"
+
+#: ../modules/addressbook/ldap-config.ui.h:18
 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.ui.h:20
+msgid "Using distinguished name (DN)"
+msgstr "Bruk distinguished name (DN)"
 
-#: ../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.ui.h:21
+msgid "Using email address"
+msgstr "Bruker e-postadresse"
 
-#: ../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
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: ../modules/addressbook/ldap-config.glade.h:34
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Find Possible Search Bases"
 msgstr "_Finn mulige søkebaser"
 
-#: ../modules/addressbook/ldap-config.glade.h:35
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Login method:"
 msgstr "Metode for på_logging:"
 
-#: ../modules/addressbook/ldap-config.glade.h:37
+#: ../modules/addressbook/ldap-config.ui.h:26
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/addressbook/ldap-config.glade.h:38
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
-#: ../modules/addressbook/ldap-config.glade.h:40
+#: ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: ../modules/addressbook/ldap-config.glade.h:41
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../modules/addressbook/ldap-config.glade.h:42
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "cards"
 msgstr "kort"
 
@@ -14431,7 +14424,7 @@ msgid "_Appointment"
 msgstr "_Avtale"
 
 #: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
@@ -14459,19 +14452,18 @@ msgid "Cale_ndar"
 msgstr "Kale_nder"
 
 #: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
 #: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../plugins/itip-formatter/itip-formatter.c:2645
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: ../modules/calendar/e-cal-shell-backend.c:759
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-backend.c:760
 msgid "The registry of calendars"
-msgstr "Primær kalender"
+msgstr "Register med kalendere"
 
 #: ../modules/calendar/e-cal-shell-migrate.c:131
 msgid ""
@@ -14501,47 +14493,45 @@ 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
+#, c-format
 msgid ""
 "Error on %s\n"
 "%s"
 msgstr ""
-"Feil på «%s»:\n"
+"Feil på %s\n"
 " %s"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:188
-#, fuzzy
 msgid "Loading calendars"
-msgstr "Laster kalender"
+msgstr "Laster kalendere"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:428
-#, fuzzy
 msgid "Calendar Selector"
-msgstr "Valg av kalenderkilde"
+msgstr "Kalendervelger"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:551
+#: ../modules/calendar/e-cal-shell-sidebar.c:598
 msgid "Date Navigator Widget"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-shell-sidebar.c:599
 msgid "This widget displays a miniature calendar"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:562
+#: ../modules/calendar/e-cal-shell-sidebar.c:609
 msgid "This widget displays groups of calendars"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:723
-#, fuzzy, c-format
+#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#, c-format
 msgid "Opening calendar at %s"
-msgstr "Åpner kalender"
+msgstr "Åpner kalender på %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:305
 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 "
@@ -14552,425 +14542,413 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 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:334
-#: ../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:741
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "dager"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:551
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:558
 msgid "Copying Items"
 msgstr "Kopierer oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:801
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:808
 msgid "Moving Items"
 msgstr "Flytter oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1091
-msgid "Save As..."
-msgstr "Lagre som..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1109
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-memo-shell-view-actions.c:530
+#: ../modules/calendar/e-task-shell-view-actions.c:655
+msgid "Save as iCalendar"
+msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1173
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1189
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Go Back"
 msgstr "Gå tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1196
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Go Forward"
 msgstr "Gå fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1203
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-task-shell-view-actions.c:839
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og møter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "Re_fresh"
+msgstr "O_ppdater"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+msgid "Refresh the selected calendar"
+msgstr "Oppdater valgt kalender"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Rename the selected calendar"
-msgstr "Endre navn på valgt mappe"
+msgstr "Endre navn på valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
-msgstr "Ny avtale som varer h_ele dagen"
+msgstr "Ny avtale som varer h_ele dagen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#: ../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:596
-#: ../modules/calendar/e-task-shell-view-actions.c:721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:322
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
-msgstr "Nytt _møte"
+msgstr "Nytt _møte..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
-msgstr "Opprett en ny møteforespørsel"
+msgstr "Lag et nytt møte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-view-memopad.c:350
+msgid "Save as iCalendar..."
+msgstr "Lagre som iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+msgid "Converts an appointment to a meeting"
+msgstr "Konverter en avtale til et møte"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Conv_ert to Appointment..."
+msgstr "Konv_erter til avtale..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+msgid "Converts a meeting to an appointment"
+msgstr "Konverterer et møte til en avtale"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1596
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
 msgid "Month"
 msgstr "Måned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+#: ../modules/calendar/e-cal-shell-view-actions.c:1612
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
-msgid "Work Week"
-msgstr "Arbeidsuke"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Show one work week"
-msgstr "Vis en uke"
+msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
-#, fuzzy
-msgid "Active Appointements"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-memo-shell-view-actions.c:837
+#: ../modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
-#: ../modules/calendar/e-memo-shell-view-actions.c:809
-#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1599
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1606
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
 msgid "Preview the calendar to be printed"
-msgstr "Forhåndsviser av kalenderen som skal skrives ut"
+msgstr "Forhåndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
 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
+#: ../modules/calendar/e-memo-shell-view-actions.c:97
 msgid "Deleting selected memos..."
-msgstr "Sletter valgte objekter..."
+msgstr "Sletter valgte notater..."
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-cal-shell-view-memopad.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 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:577
+#: ../modules/calendar/e-cal-shell-view-memopad.c:303
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 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:584
+#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 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:589
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:315
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "_Delete Memo"
-msgstr "_Slett melding"
+msgstr "_Slett notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-memopad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 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:645
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:329
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
 msgid "New _Memo"
-msgstr "Nytt notat"
+msgstr "Nytt _notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-cal-shell-view-memopad.c:331
 #: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
 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:652
+#: ../modules/calendar/e-cal-shell-view-memopad.c:336
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
 msgid "_Open Memo"
 msgstr "_Åpne notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:689
 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:659
-#: ../modules/calendar/e-task-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:343
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:431
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:832
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:341
-#: ../modules/calendar/e-memo-shell-view-actions.c:835
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:870
 msgid "Print the selected memo"
-msgstr "Vis valgt notat"
+msgstr "Skriv ut valgt notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:423
-#: ../modules/calendar/e-memo-shell-view.c:223
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:444
+#: ../modules/calendar/e-memo-shell-view.c:232
 msgid "Delete Memo"
 msgid_plural "Delete Memos"
-msgstr[0] "Deleger til"
-msgstr[1] "Deleger til"
+msgstr[0] "Slett notat"
+msgstr[1] "Slett notater"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:127
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:128
 msgid "Deleting selected tasks..."
-msgstr "Sletter valgte objekter..."
+msgstr "Sletter valgte oppgaver..."
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 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:702
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 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:709
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 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:714
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "_Delete Task"
-msgstr "_Slett"
+msgstr "_Slett oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 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:770
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 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:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 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:410
+msgid "_Mark 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:779
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:412
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Mark selected tasks as incomplete"
-msgstr "Merk valgte oppgaver som fullført"
+msgstr "Merk valgte oppgaver som ikke fullført"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:398
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:419
 #: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:820
 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:791
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:424
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Open Task"
 msgstr "_Åpne oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:426
+#: ../modules/calendar/e-task-shell-view-actions.c:827
 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:666
-#: ../modules/calendar/e-task-shell-view-actions.c:812
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:438
+#: ../modules/calendar/e-memo-shell-view-actions.c:885
+#: ../modules/calendar/e-task-shell-view-actions.c:1084
 msgid "_Save as iCalendar..."
-msgstr "_Videresend som iCalendar..."
+msgstr "_Lagre som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
-#: ../modules/calendar/e-task-shell-view-actions.c:1035
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:450
+#: ../modules/calendar/e-task-shell-view-actions.c:1069
 msgid "Print the selected task"
-msgstr "Vis valgt oppgave"
+msgstr "Skriv ut valgt oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:534
-#: ../modules/calendar/e-task-shell-view.c:350
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:555
+#: ../modules/calendar/e-task-shell-view.c:359
 msgid "Delete Task"
 msgid_plural "Delete Tasks"
-msgstr[0] "Deleger til"
-msgstr[1] "Deleger til"
+msgstr[0] "Slett oppgave"
+msgstr[1] "Slett oppgaver"
 
 #: ../modules/calendar/e-memo-shell-backend.c:316
 msgctxt "New"
@@ -14978,32 +14956,30 @@ msgid "Mem_o"
 msgstr "N_otat"
 
 #: ../modules/calendar/e-memo-shell-backend.c:323
-#, fuzzy
+msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Delt notat"
 
 #: ../modules/calendar/e-memo-shell-backend.c:325
-#, fuzzy
 msgid "Create a new shared memo"
 msgstr "Lag et nytt delt notat"
 
 #: ../modules/calendar/e-memo-shell-backend.c:333
-#, fuzzy
 msgctxt "New"
 msgid "Memo Li_st"
-msgstr "Notatliste"
+msgstr "Notatli_ste"
 
 #: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:583
+#: ../modules/calendar/e-memo-shell-backend.c:584
 #, fuzzy
 msgid "The registry of memo lists"
 msgstr "Primær notatliste"
 
-#: ../modules/calendar/e-memo-shell-content.c:598
+#: ../modules/calendar/e-memo-shell-content.c:602
 #, fuzzy
 msgid "The memo table model"
 msgstr "Modell for tabell"
@@ -15017,80 +14993,79 @@ msgstr "Laster notater"
 msgid "Memo List Selector"
 msgstr "Valgt av notatkilde"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:529
+#: ../modules/calendar/e-memo-shell-sidebar.c:544
 msgid "This widget displays groups of memo lists"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#: ../modules/calendar/e-memo-shell-sidebar.c:697
 #, 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
+#: ../modules/calendar/e-memo-shell-view-actions.c:254
+#: ../modules/calendar/e-memo-shell-view-actions.c:271
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+msgid "Refresh the selected memo list"
+msgstr "Oppdater valgt notatliste"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "Endre navn på valgt mappe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 #, fuzzy
 msgid "Show _Only This Memo List"
 msgstr "Vis k_un denne notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
 msgid "Memo _Preview"
-msgstr "_Forhåndsvis"
+msgstr "_Forhåndsvisning av notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:770
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "Vis forhåndsvisningsområdet"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:763
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
 msgid "Show memo preview below the memo list"
-msgstr "Vis meldingen under meldingslisten"
+msgstr "Vis forhåndsvisning av notat under notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:770
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
 msgid "Show memo preview alongside the memo list"
-msgstr "Vis meldingen under meldingslisten"
+msgstr "Vis forhåndsvisning av notat ved siden av notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:856
 msgid "Print the list of memos"
 msgstr "Skriv ut denne listen med notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:863
 msgid "Preview the list of memos to be printed"
-msgstr "Forhåndsviser listen over notater som skal skrives ut"
+msgstr "Forhåndsvis listen med notater som skal skrives ut"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:412
+#: ../modules/calendar/e-memo-shell-view-private.c:417
 #, 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:416
-#: ../modules/calendar/e-task-shell-view-private.c:510
-#, fuzzy, c-format
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:572
+#, c-format
 msgid "%d selected"
-msgstr ", %d valgt"
+msgstr "%d valgt"
 
-#: ../modules/calendar/e-memo-shell-view.c:221
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view.c:230
 msgid "Delete Memos"
-msgstr "_Slett melding"
+msgstr "Slett notater"
 
 #: ../modules/calendar/e-task-shell-backend.c:320
 msgctxt "New"
@@ -15098,7 +15073,7 @@ msgid "_Task"
 msgstr "_Oppgave"
 
 #: ../modules/calendar/e-task-shell-backend.c:327
-#, fuzzy
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
@@ -15107,25 +15082,22 @@ msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
 #: ../modules/calendar/e-task-shell-backend.c:337
-#, fuzzy
 msgctxt "New"
 msgid "Tas_k List"
-msgstr "Oppgaveliste"
+msgstr "_Oppgaveliste"
 
 #: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:593
-#, fuzzy
+#: ../modules/calendar/e-task-shell-backend.c:594
 msgid "The registry of task lists"
-msgstr "Primær oppgaveliste"
+msgstr "Register for oppgavelister"
 
-#: ../modules/calendar/e-task-shell-content.c:621
-#, fuzzy
+#: ../modules/calendar/e-task-shell-content.c:625
 msgid "The task table model"
-msgstr "Modell for tabell"
+msgstr "Modell for oppgavetabell"
 
 #: ../modules/calendar/e-task-shell-migrate.c:98
 msgid ""
@@ -15150,25 +15122,24 @@ msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:397
-#, fuzzy
 msgid "Task List Selector"
-msgstr "Valgt av oppgavekilde"
+msgstr "Valg av oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:527
+#: ../modules/calendar/e-task-shell-sidebar.c:542
 msgid "This widget displays groups of task lists"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-sidebar.c:680
+#: ../modules/calendar/e-task-shell-sidebar.c:695
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view-actions.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:302
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:600
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15180,93 +15151,92 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:728
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:755
 msgid "Copy..."
-msgstr "_Kopier..."
+msgstr "Kopier..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Refresh the selected task list"
+msgstr "Oppdater valgt oppgaveliste"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Rename the selected task list"
-msgstr "Endre navn på valgt mappe"
+msgstr "Endre navn på valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Show _Only This Task List"
 msgstr "Vis k_un denne oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:777
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:811
 msgid "Mar_k as Incomplete"
-msgstr "_Merk som ikke-fullført"
+msgstr "Merk som _ikke fullført"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-task-shell-view-actions.c:841
 msgid "Delete completed tasks"
 msgstr "Slett fullførte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:932
 msgid "Task _Preview"
 msgstr "Forhåndsvisning av _oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Show task preview pane"
-msgstr "Vis forhåndsvisningsområdet"
+msgstr "Vis forhåndsvisningsområde for oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:955
 msgid "Show task preview below the task list"
-msgstr "Vis meldingen under meldingslisten"
+msgstr "Vis forhåndsvisning av oppgave under oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:962
 msgid "Show task preview alongside the task list"
-msgstr "Vis meldingen under meldingslisten"
+msgstr "Vis forhåndsvisning av oppgave ved siden av oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Completed Tasks"
 msgstr "Fullførte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Overdue Tasks"
 msgstr "Utgåtte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/calendar/e-task-shell-view-actions.c:1005
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Preview the list of tasks to be printed"
-msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
+msgstr "Forhåndsvis listen over oppgaver som skal skrives ut"
 
-#: ../modules/calendar/e-task-shell-view-private.c:506
+#: ../modules/calendar/e-task-shell-view-private.c:464
+msgid "Expunging"
+msgstr "Tømmer"
+
+#: ../modules/calendar/e-task-shell-view-private.c:568
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/calendar/e-task-shell-view.c:348
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view.c:357
 msgid "Delete Tasks"
-msgstr "Fullførte oppgaver"
+msgstr "Slett oppgaver"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:335
@@ -15296,6 +15266,10 @@ msgstr "Opprett en ny e-postmappe"
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
+#: ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
+
 #: ../modules/mail/e-mail-shell-backend.c:221
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
@@ -15305,40 +15279,40 @@ msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #. green
-#: ../modules/mail/e-mail-shell-migrate.c:958
+#: ../modules/mail/e-mail-shell-migrate.c:959
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: ../modules/mail/e-mail-shell-migrate.c:959
+#: ../modules/mail/e-mail-shell-migrate.c:960
 msgid "Later"
 msgstr "Senere"
 
-#: ../modules/mail/e-mail-shell-migrate.c:1138
+#: ../modules/mail/e-mail-shell-migrate.c:1139
 msgid "Migration"
 msgstr "Flytting"
 
-#: ../modules/mail/e-mail-shell-migrate.c:1588
+#: ../modules/mail/e-mail-shell-migrate.c:1589
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:1617
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:1812
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+#: ../modules/mail/e-mail-shell-migrate.c:2915
 msgid "Migrating Folders"
 msgstr "Flytter mapper"
 
-#: ../modules/mail/e-mail-shell-migrate.c:1818
+#: ../modules/mail/e-mail-shell-migrate.c:1819
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -15350,31 +15324,31 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../modules/mail/e-mail-shell-migrate.c:2021
+#: ../modules/mail/e-mail-shell-migrate.c:2022
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:2038
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:2070
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:2541
+#: ../modules/mail/e-mail-shell-migrate.c:2555
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:2916
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -15386,12 +15360,12 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../modules/mail/e-mail-shell-migrate.c:3012
+#: ../modules/mail/e-mail-shell-migrate.c:3013
 #, 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
+#: ../modules/mail/e-mail-shell-migrate.c:3031
 #, c-format
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -15400,373 +15374,363 @@ 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:1032
-#: ../modules/mail/e-mail-shell-view.c:418
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:975
+#: ../modules/mail/e-mail-shell-view.c:508
 msgid "_Disable Account"
-msgstr "Deaktiver konto"
+msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Disable this account"
-msgstr "Deaktiver konto"
+msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:982
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:989
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 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:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:996
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:998
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 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:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1010
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1017
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1019
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1026
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1081
+#: ../modules/mail/e-mail-shell-view-actions.c:1031
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1033
 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:1088
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:1040
 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:1095
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 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:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1125
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "Select _All Messages"
 msgstr "Velg _alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1089
 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:1144
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 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:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Unsubscribe from the selected folder"
-msgstr "Endre navn på valgt mappe"
+msgstr "Fjern abonnement på valgt mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
 msgid "N_one"
-msgstr "Ingen"
+msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1172
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Hide _Read Messages"
 msgstr "Skjul _leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1174
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Skjul alle leste meldinger midlertidig"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Temporarily hide the selected messages"
 msgstr "Skjul valgte meldinger midlertidig"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Show Hidde_n Messages"
 msgstr "Vis skjulte meldi_nger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "Show messages that have been temporarily hidden"
 msgstr "Vis meldinger som er midlertidig skjult"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 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:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Create or edit search folder definitions"
-msgstr "Opprett eller rediger definisjoner av søkemapper"
+msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "_Subscriptions..."
 msgstr "_Abonnement..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 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:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1274
 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:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1281
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "Show message preview pane"
-msgstr "Vis vindu for forhåndsvisning av melding"
+msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1339
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1341
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1362
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Show message preview alongside the message list"
-msgstr "Vis meldingen under meldingslisten"
+msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1419
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1478
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1488
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1495
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1502
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-private.c:726
+#: ../modules/mail/e-mail-shell-view-private.c:831
 #, 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:737
+#: ../modules/mail/e-mail-shell-view-private.c:842
 #, 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:743
-#: ../modules/mail/e-mail-shell-view-private.c:750
+#: ../modules/mail/e-mail-shell-view-private.c:848
+#: ../modules/mail/e-mail-shell-view-private.c:855
 #, 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:756
+#: ../modules/mail/e-mail-shell-view-private.c:861
 #, 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:762
+#: ../modules/mail/e-mail-shell-view-private.c:867
 #, 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:768
+#: ../modules/mail/e-mail-shell-view-private.c:873
 #, 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:780
+#: ../modules/mail/e-mail-shell-view-private.c:885
 #, 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:783
+#: ../modules/mail/e-mail-shell-view-private.c:888
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view.c:416
+#: ../modules/mail/e-mail-shell-view.c:506
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/em-composer-prefs.c:478
+#: ../modules/mail/em-composer-prefs.c:477
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -15799,7 +15763,7 @@ 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-click-to-add.c:498
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Topptekst"
@@ -15809,26 +15773,34 @@ 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
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
 #, 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
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:803
 #, 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"
+#: ../modules/mail/em-mailer-prefs.c:767
+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/mail/em-mailer-prefs.c:1151
+msgid "_Table column:"
+msgstr "Kolonne i _tabell:"
+
+#: ../modules/mail/em-mailer-prefs.c:1152
+msgid "_Date header:"
+msgstr "_Datohode:"
+
+#: ../modules/mail/em-mailer-prefs.c:1153
+msgid "Show _original header value"
+msgstr "Vis _opprinnelig verdi for hode"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -15870,8 +15842,8 @@ msgstr ""
 "Liste med hint om ting å se etter i meldingskroppen for tillegg for "
 "påminnelse om vedlegg."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:378
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -15905,32 +15877,30 @@ 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
-#, fuzzy
 msgid "Inline Audio"
-msgstr "vCard i e-post"
+msgstr "Lyd i e-post"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#, fuzzy
 msgid "Play audio attachments directly in mail messages."
-msgstr "Spill av lyd-vedlegg direkte i Evolution."
+msgstr "Spill av lyd-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/backup-restore/backup-restore.c:143
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:168
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:198
+#: ../plugins/backup-restore/backup-restore.c:209
 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:219
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:293
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15940,41 +15910,37 @@ 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:300
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:310
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:318
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Restore from backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:353
 msgid "_Backup Settings..."
 msgstr "_Innstillinger for sikkerhetskopiering..."
 
-#: ../plugins/backup-restore/backup-restore.c:356
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
-msgstr ""
-"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
+msgstr "Sikkerhetskopier data og innstillinger til en arkivfil"
 
-#: ../plugins/backup-restore/backup-restore.c:361
+#: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
 msgstr "Gj_enopprett innstillinger..."
 
-#: ../plugins/backup-restore/backup-restore.c:363
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
-msgstr ""
-"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
+msgstr "Gjenopprett data og innstillinger fra en arkivfil"
 
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
@@ -16141,35 +16107,35 @@ msgstr ""
 "ikke-lagrede data før du fortsetter. Hvis du ønsker at Evolution skal starte "
 "automatisk etter gjenoppretting kan du velge det her."
 
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:670 ../plugins/bbdb/bbdb.c:679
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:694
 msgid "Create _address book entries when sending mails"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du sender e-post"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:700
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:736
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:747
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
@@ -16191,28 +16157,33 @@ msgstr ""
 "som du svarer på meldinger. Fyller også ut IM-kontaktinformasjon fra dine "
 "vennelister."
 
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr "Bogofilter er ikke tilgjengelig. Vennligst installer programmet først."
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "En feil oppsto under start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Underprosess til Bogofilter svarer ikke. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venting på underprosess til Bogofilter avbrutt. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rør til Bogofilter feilet. Feilkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
@@ -16264,15 +16235,6 @@ msgstr "Bruk _SSL"
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-msgid "weeks"
-msgstr "uker"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "Legg til støtte for CalDAV i Evolution."
@@ -16393,6 +16355,23 @@ msgstr "Legg til værkalendere i Evolution."
 msgid "Weather Calendars"
 msgstr "Værkalendere"
 
+#: ../plugins/contacts-map/contacts-map.c:59
+#: ../plugins/contacts-map/contacts-map.c:193
+msgid "Contacts map"
+msgstr "Kontaktkart"
+
+#: ../plugins/contacts-map/contacts-map.c:60
+msgid "Show a map of all the contacts"
+msgstr "Vis et kart med alle kontaktene"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+msgid "Map for contacts"
+msgstr "Kart for kontakter"
+
 #: ../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"
@@ -16415,19 +16394,23 @@ 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-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "Merk som _forvalgt adressebok"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:119
+msgid "A_utocomplete with this address book"
+msgstr "Bruk a_utomatisk fullføring med denne adresseboken"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "Merk som _forvalgt kalender"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "Merk som _forvalgt oppgaveliste"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "Merk som _forvalgt notatliste"
 
@@ -16454,41 +16437,33 @@ msgstr ""
 "og verdi er: Navn på egendefinert meldingshode fulgt av «=» og verdiene "
 "adskilt med «;»"
 
-#: ../plugins/email-custom-header/email-custom-header.c:332
+#: ../plugins/email-custom-header/email-custom-header.c:318
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:337
+#: ../plugins/email-custom-header/email-custom-header.c:323
 msgid "Unclassified"
 msgstr "Uklassifisert"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:324
 msgid "Protected"
 msgstr "Beskyttet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgid "Top secret"
 msgstr "Topphemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:583
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
-#: ../plugins/email-custom-header/email-custom-header.c:905
-msgid "Key"
-msgstr "Nøkkel"
-
-#: ../plugins/email-custom-header/email-custom-header.c:916
-#: ../plugins/templates/templates.c:384
-msgid "Values"
-msgstr "Verdier"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16496,6 +16471,15 @@ 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/email-custom-header.c:948
+msgid "Key"
+msgstr "Nøkkel"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "Verdier"
+
 #. 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."
@@ -16505,958 +16489,10 @@ msgstr "Legger til egendefinerte meldingshoder i utgående meldinger."
 msgid "Custom Header"
 msgstr "Egendefinert meldingshode"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.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"
-msgstr "Åpne annen brukers mappe"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "K_onto:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Mappe_navn:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "Br_uker:"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "Sikkert passord"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Dette alternativet kobler til Exchange-tjeneren ved bruk av autentisering "
-"med sikkert passord (NTLM)."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "Klartekst-passord"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Dette valget vil la deg koble til Exchange-tjeneren med et vanlig klartekst-"
-"passord."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "Ute av kontoret"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"Meldingen spesifisert under vil sendes automatisk til alle \n"
-"som sender deg e-post mens du er borte fra kontoret."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "Jeg er ute av kontoret"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "Jeg er på kontoret"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "Endre passordet for Exchange-kontoen"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "Endre passord"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "Håndter innstillinger for delegater for en Exchange konto"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "Assistent for delegering"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "Forskjellig"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "Se størrelsen på alle Exchange-mapper"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "Mappestørrelse"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Innstillinger for Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "_OWA-URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "A_utentiser"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "Navn på postboks er _forskjellig fra brukernavn"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "_Postboks:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "_Autentiseringstype"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution er i frakoblet modus. Du kan ikke opprette eller endre mapper nå.\n"
-"Vennligst bytt til tilkoblet modus for slike operasjoner."
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"Det nåværende passordet er ikke likt det eksisterende passordet for din "
-"konto. Skriv inn det riktige passordet"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "De to passordene er ikke like. Skriv inn passordene på nytt."
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "Bekreft passord:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "Nåværende passord:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "Nytt passord:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "Ditt nåværende passord har utløpt. Endre passordet nå."
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "Passordet ditt vil utløpe i løpet av de neste %d dagene"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "Egendefinert"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "Redaktør (lese, opprette, redigere)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "Forfatter (les, opprett)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "Korrekturleser (skrivebeskyttet)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "Rettigheter for delegat"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "Rettigheter for %s"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"Denne meldingen ble sendt automatisk av Evolution for å informere deg om at "
-"du er tilegnet rollen som delegat. Du kan nå sende meldinger på mine vegne."
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "Du har blitt gitt følgende rettigheter på mine mapper:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "Du kan også se mine private oppføringer."
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "Men du kan ikke se mine private oppføringer."
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "Du er satt opp som delegat for %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "Deleger til"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "Fjern delegat %s?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "Kunne ikke aksessere Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "Kunne ikke finne meg selv i Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Kunne ikke finne delegat %s i Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "Kunne ikke fjerne delegat %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "Kunne ikke oppdatere liste med delegater."
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "Kan ikke legge til delegat %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "Feil under lesing av liste med delegater."
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "K_alender:"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "Ko_ntakter: "
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "Delegater"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"Ingen\n"
-"Gjennomsyn (skrivebeskyttet)\n"
-"Forfatter (les, opprett)\n"
-"Redaktør (les, opprett, rediger)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "Rettigheter for"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"Disse brukerene vil være i stand til å sende e-post på dine vegne\n"
-"og få tilgang til dine mapper med rettighetene du gir dem."
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "_Delegat kan se private elementer"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "_Innboks:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "_Sammendrag av rettigheter"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "_Oppgaver:"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "Rettigheter..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "Mappenavn"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "Mappestørrelse"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "Bruker"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Abonner på annen brukers mappe"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Tre for Exchange-mappe"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "Fjern abonnement på mappe..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Fjerne abonnement på mappen «%s»?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Fjern abonnement på «%s»"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Du er nå registrert som «Ute av kontoret». </b>\n"
-"\n"
-"Ønsker du å endre status til «Inne»?"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Melding ved fravær:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b> "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Meldingen spesifisert under vil sendes automatisk til alle som sender "
-"deg\n"
-"e-post mens du er borte fra kontoret.</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Jeg er inne"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Jeg er borte"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Nei, ikke endre status"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Fraværsassistent"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Ja, endre status"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "Varsel om utløp av passord..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "Passordet ditt utløper om 7 dager..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "En_dre passord"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(Tilgang nektet.)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "Legg til bruker:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "Legg til bruker"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>Rettigheter</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "Kan ikke slette"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "Kan ikke redigere"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "Opprett oppføringer"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "Opprett mapper"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "Slett alle oppføringer"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "Slett egne oppføringer"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "Rediger alle oppføringer"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "Rediger egne oppføringer"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "Mappekontakt"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "Mappeeier"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "Synlig mappe"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "Leste oppføringer"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "Rolle: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>Innstillinger for melding</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>Alternativer for sporing</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - Alternativer for sending"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "V_iktighet"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"Normal\n"
-"Høy\n"
-"Lav"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"Normal\n"
-"Personlig\n"
-"Privat\n"
-"Konfidensiell"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "Spør etter _leveringskvittering for denne meldingen"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "Spør etter _lesekvittering for denne meldingen"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "Send som delegat"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "_Sensitivitet: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "Br_uker"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:131
-msgid "Select User"
-msgstr "Velg bruker"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:169
-msgid "Address Book..."
-msgstr "Adressebok..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "Abonner på annen brukers kontakter"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "Abonner på annen brukers kalender"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "Slå på utvidelsespakken Evolution-Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Operasjoner for Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "Kan ikke lese «Innstillinger for Exchange» fanen i frakoblet modus."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "Kan ikke endre passord på grunn av konfigurasjonsproblemer."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "Kan ikke vise mapper."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "Kan ikke utføre operasjonen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Endringer i valg for Exchange konto «{0}» vil kun aktiveres etter at du har "
-"startet Evolution på nytt."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "Kunne ikke autentisere mot tjener."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "Kunne ikke bytte passord."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"Kunne ikke konfigurere Exchange-kontoen fordi\n"
-"en ukjent feil oppstod. Se til at URL-en,\n"
-"brukernavnet og passordet er riktig og prøv igjen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "Kunne ikke koble til Exchange-tjener."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "Kunne ikke koble til tjener {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "Kunne ikke fastslå mapperettigheter for delegater."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "Fant ikke Exchange Web Storage System."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "Kunne ikke finne tjener {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "Kunne ikke gjøre {0} til en delegat"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "Kunne ikke lese mapperettigheter"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "Kunne ikke lese mapperettigheter."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "Kunne ikke lese «ute fra kontoret»-tilstand"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "Kunne ikke oppdatere mapperettigheter."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "Kunne ikke oppdatere «ute fra kontoret»-tilstand"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Evloution må startes på nytt for å laste abonnert brukers postboks"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange-kontoen er frakoblet."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"Exchange Connector krever tilgang til spesifikk\n"
-"funksjonalitet på Exchange serveren som ser ut\n"
-"til å være deaktivert eller blokkert. (Dette er\n"
-"vanligvis ikke intensjonen.) Din Exchange administrator\n"
-"vil måtte aktivere denne funksjonaliteten for at\n"
-"du skal kunne bruke Exchange Connector.\n"
-"\n"
-"Følg lenken under for å finne informasjonen din\n"
-"Exchange administrator trenger:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "Kunne ikke oppdatere delegater:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "Mappen eksisterer allerede"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "Mappen eksisterer ikke"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "Mappen er frakoblet"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-msgid "Generic error"
-msgstr "Vanlig feil"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "Global katalogtjener kan ikke nås"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Hvis OWA bruker en annen sti må denne oppgis i konfigurasjonsdialogen for "
-"kontoen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "E-postboks for {0} er ikke på denne tjeneren."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "Se til at URL-en er riktig og prøv igjen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "Se til at tjenernavnet er stavet riktig og prøv igjen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "Se til at brukernavnet og passordet er riktig og prøv igjen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "Ingen global katalogtjener er konfigurert for denne kontoen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "Ingen postboks for bruker {0} på {1}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "Bruker {0} finnes ikke"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "Endring av passord fullført."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr ""
-"Vennligst oppgi ID for delegat eller fjern valget for å sende som delegat."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "Vennlist sjekk at navnet på Global Catalog Server er korrekt."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Vennligst start Evolution på nytt for at endringene skal aktiveres"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "Velg en bruker."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "Tjeneren avslo passordet fordi det er for svakt."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "Exchange-kontoen vil bli deaktivert når du avslutter Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "Exchange-kontoen vil bli fjernet når du avslutter Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "Exchange-tjeneren samspiller ikke med Exchange Connector."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"Denne tjeneren kjører Exchange 5.5. Exchange Connector \n"
-"støtter bare Microsoft Exchange 2000 og 2003."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"Dette betyr sannsynligvis at din tjener krever \n"
-"at du oppgir Windows domenenavnet \n"
-"som en del av ditt brukernavn (f.eks &quot;DOMENE\\bruker&quot;).\n"
-"\n"
-"Eller du kan ha skrevet inn feil passord."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "Prøv igjen med et annet passord."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "Klarte ikke å legge til bruker i listen over tilgangskontroll:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "Klarte ikke å redigere delegater."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-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:623
-#: ../plugins/mail-to-task/mail-to-task.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:838
-msgid "Unknown error."
-msgstr "Ukjent feil."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "Ukjent type"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "Operasjonen er ikke støttet"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"Du nærmer deg den tilgjengelige kvoten for lagring av e-post på denne "
-"tjeneren."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "Du kan kun sende en melding på vegne av en bruker om gangen."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "Du kan ikke gjøre deg selv til din egen delegat"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "Du har overgått din kvote for lagring av e-post på denne tjeneren."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "Du kan bare konfigurere en Exchange-konto."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"Din nåværende bruk er: {0} KB. Prøv å frigjøre litt plass ved å slette noen "
-"meldinger."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"Din nåværende bruk er: {0} KB. Du vil ikke kunne sende eller motta e-post nå."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"Din nåværende bruk er: {0} KB. Du vil ikke kunne sende e-post før du frigjør "
-"litt plass ved å slette noen meldinger."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "Passordet ditt har forfallt."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} kan ikke legges til i listen over tilgangskontroll"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} er allerede en delegat"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} finnes allerede på listen"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "Abonner på annen brukers oppgaver"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "Sjekk rettighetene for mappen"
-
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
@@ -17487,8 +16523,8 @@ 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
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
 msgid "Compose in External Editor"
 msgstr "Skriv i eksternt redigeringsprogram"
 
@@ -17538,30 +16574,67 @@ msgstr ""
 "Eksternt redigeringsprogram som er satt i dine brukervalg for tillegg kan "
 "ikke startes. Prøv å bruke et annet redigeringsprogram."
 
-#: ../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/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+
+#: ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr "Velg et png-bilde (det beste er 48 * 48 med størrelse < 720 byte)"
+
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "Bildefiler"
 
-#: ../plugins/face/face.c:68
-msgid "PNG files"
-msgstr "PNG-filer"
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr "Sett _inn ansiktsbilde som forvalg"
 
-#: ../plugins/face/face.c:125
-msgid "_Face"
-msgstr "A_nsikt"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr "Last nytt ansikts_bilde"
+
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr "Ta _med ansikt"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Legg ved et lite bilde av ditt ansikt til utgående meldinger."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Lesing feilet"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "Ugyldig bildestørrelse"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "Ikke et bilde"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Vennligst velg et bilde med størrelse 48 * 48"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "Filen kunne ikke leses"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
-"Legg ved ansikts-header i utgående meldinger.\n"
-"\n"
-"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/google-account-setup/google-contacts-source.c:51
 #: ../plugins/google-account-setup/google-source.c:81
@@ -17587,6 +16660,12 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "Ukjent feil."
+
 #: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
@@ -17603,25 +16682,45 @@ msgstr "Legg til kalendere fra Google i Evolution."
 msgid "Google Calendars"
 msgstr "Google kalendere"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:451
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "Legg til støtte for Novell GroupWise i Evolution."
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "Ny _delt mappe..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "Oppsett av konto for GroupWise"
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "_Brukernavn for proxy..."
 
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "Innstillinger for uønsket e-post..."
+
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "Spor status på melding..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "Kall tilbake e-post"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "Godta tentativt"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "Se_nd møte på nytt..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:218
-#, fuzzy, c-format
+#: ../plugins/groupwise-features/install-shared.c:225
+#, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17642,62 +16741,58 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Klikk «Framover» for å installere den delte mappen\n"
+"Klikk «Bruk» for å installere den delte mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:230
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "Installer delt mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:234
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "Installering av delt mappe"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "Innstillinger for uønsket e-post"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Innstillinger for uønsket e-post"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "Innstillinger for uønsket e-post..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>Liste over uønsket e-post:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+msgid "Junk List:"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:484
 msgid "_Disable"
 msgstr "_Deaktiver"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "Aktiv_er"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 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
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "Trekk tilbake melding"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
-#, fuzzy
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17705,13 +16800,13 @@ msgstr ""
 "Tilbaketrekking av en melding kan fjerne den fra en mottakers postboks. Er "
 "du sikker på at du vil gjøre dette?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "Melding kalt tilbake"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "Kall tilbake e-post"
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "Insert Send options"
+msgstr "Sett inn alternativer for sending"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -17786,17 +16881,14 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "Du må oppgi et brukernavn du ønsker å legge til på listen"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#, fuzzy
 msgid "Do you want to resend the meeting?"
 msgstr "Vil du sende møtet på nytt?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#, fuzzy
 msgid "Do you want to resend the recurring meeting?"
-msgstr "Vil du sende repeterende møte på nytt?"
+msgstr "Vil du sende det repeterende møtet på nytt?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#, fuzzy
 msgid "Do you want to retract the original item?"
 msgstr "Vil du trekke tilbake den opprinnelige oppføringen?"
 
@@ -17830,225 +16922,196 @@ msgstr "Vil du lagre godta det?"
 msgid "Would you like to decline it?"
 msgstr "Vil du avslå det?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "Godta tentativt"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "Se_nd møte på nytt..."
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Brukere:</b> "
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Tilpass varslingsmelding"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:512
 msgid "Message"
 msgstr "Melding"
 
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "Melding om delte mapper"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Deltakerene vil motta følgende varsel.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Ikke delt"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "_Delt med..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "_Deling"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>Navn</b> "
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Tilgangsrettigheter"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "Legg til/rediger"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-msgid "Appointments"
-msgstr "Avtaler"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "Kon_takter"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "Endre _mapper/alternativer/regler/"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "Les elementer markert som _privat"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "Påminnelsenotater"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "Abonner på mine _alarmer"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "Abonner på mine _påminnelser"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "_Skriv"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "_Les"
 
-#. 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Kontonavn</b>"
 
-#. 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-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Proxy-innlogging"
 
-#: ../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
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 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:513
-msgid "_Proxy Login..."
-msgstr "_Brukernavn for proxy..."
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
 
 #. 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.c:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:702
+msgid "Add User"
+msgstr "Legg til bruker"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "Avanserte alternativer for sending"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "Ny _delt mappe..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:448
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "Deling"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "Egendefinert varsling"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:742
 msgid "Add   "
 msgstr "Legg til"
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Modify"
 msgstr "Endre"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Meldingsstatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "Fra:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Dato for opprettelse:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:205
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Delivered: "
 msgstr "Levert: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:218
 msgid "Opened: "
 msgstr "Åpnet: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:223
 msgid "Accepted: "
 msgstr "Godtatt: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:228
 msgid "Deleted: "
 msgstr "Slettet: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:233
 msgid "Declined: "
 msgstr "Avslått: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Completed: "
 msgstr "Fullført: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:243
 msgid "Undelivered: "
 msgstr "Ikke levert: "
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "Spor status på melding..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "Legg til støtte for Hula i Evolution."
@@ -18057,28 +17120,30 @@ msgstr "Legg til støtte for Hula i Evolution."
 msgid "Hula Support"
 msgstr "Støtte for Hula"
 
-#: ../plugins/imap-features/imap-headers.c:331
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Bilde i e-postmeldingen"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "Vis bildevedlegg direkte i e-postmeldinger."
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.c:344
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>Egendefinerte meldingshoder</b> "
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP-meldingshoder</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr ""
 "Grunnleggende meldingshoder og meldingshoder for e-postlister (Forvalg)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18088,7 +17153,7 @@ msgstr ""
 "meldingshoder oppgitt over.\n"
 "Du kan overse dette hvis du velger «Alle meldingshoder»."
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18097,7 +17162,7 @@ msgstr ""
 "Hvis du velger flere meldingshoder her vil dette påvirke tiden det tar å "
 "laste dem ned."
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18105,7 +17170,7 @@ msgstr ""
 "_Grunnleggende meldingshoder - (Raskest)\n"
 "Bruk dette valget hvis du ikke har filter basert på e-postlister"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "Hent alle meldin_gshoder"
 
@@ -18117,173 +17182,141 @@ msgstr "Endre innstillinger for dine IMAP-kontoer."
 msgid "IMAP Features"
 msgstr "IMAP-funksjoner"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "Hardware Abstraction Layer ikke lastet"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"«hald»-tjenesten kreves men kjører ikke. Vennligst aktiver tjenesten og kjør "
-"dette programmet på nytt, eller kontakt din systemadministrator."
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "Søk etter en iPod feilet"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution kunne ikke finne en iPod å synkronisere med. Enten er den ikke "
-"koblet til systemet eller så er den ikke slått på."
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:163
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar-format (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "Synkroniser til iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "Synkroniser dine data med Apple iPod."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod-synkronisering"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:619
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kunne ikke åpne kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:639
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender «%s» er i konflikt med dette møtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:675
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:762
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:769
+#: ../plugins/itip-formatter/itip-formatter.c:781
 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:773
+#: ../plugins/itip-formatter/itip-formatter.c:785
 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:777
+#: ../plugins/itip-formatter/itip-formatter.c:789
 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:848
+#: ../plugins/itip-formatter/itip-formatter.c:860
 msgid "Opening the calendar. Please wait.."
 msgstr "Åpner kalender. Vennligst vent..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:851
+#: ../plugins/itip-formatter/itip-formatter.c:863
 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:1033
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, 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:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1136
+#: ../plugins/itip-formatter/itip-formatter.c:1148
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1141
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1146
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1252
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1259
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1261
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1357
+#: ../plugins/itip-formatter/itip-formatter.c:1372
 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:1386
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1434
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1437
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 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:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 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:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1452
 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:1505
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1517
+msgid "calendar.ics"
+msgstr "kalender.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1522
+msgid "Save Calendar"
+msgstr "Lagre kalender"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1506
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1587
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18291,15 +17324,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
-#: ../plugins/itip-formatter/itip-formatter.c:1585
-#: ../plugins/itip-formatter/itip-formatter.c:1677
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1558
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1678
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18307,11 +17340,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18319,217 +17352,217 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2347
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2350
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2583
+#: ../plugins/itip-formatter/itip-formatter.c:2670
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2593
-#: ../plugins/itip-formatter/itip-formatter.c:2626
+#: ../plugins/itip-formatter/itip-formatter.c:2680
+#: ../plugins/itip-formatter/itip-formatter.c:2713
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2695
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M"
 msgstr "I morgen %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgen %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgen %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:240
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgen %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:259
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:329
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Vennligst svar på vegne av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Mottatt på vegne av <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> har via %s publisert følgende møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publisert følgende møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> har delegert følgende møte til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> forespør via %s din tilstedeværelse i et møte."
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:373
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> forespør din tilstedeværelse i følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18537,89 +17570,89 @@ msgid ""
 msgstr ""
 "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> har via %s avlyst følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> har avlyst følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> har foreslått følgende endringer i møte via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> har foreslått følgende endringer i møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> har via %s avslått følgende endringer for møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> har avslått følgende endringer for møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> har via %s publisert følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> har publisert følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> forespør at %s tildeles følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> har via %s tildelt deg en oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:461
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> har tildelt deg en oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "<b>%s</b> forespør via %s å legge til informasjon i eksisterende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18628,7 +17661,7 @@ msgstr ""
 "<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt "
 "oppgave via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18637,175 +17670,193 @@ msgstr ""
 "<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt "
 "oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> har via %s avlyst følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> har avlyst følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling via %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:499
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> har via %s publisert følgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> har publisert følgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 "<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> har via %s avlyst følgende delt notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har avlyst følgende delt notat:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "Hele dagen:"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "Startdag:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "Start-tid:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "Sluttdag:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "Slutt-tid:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 msgid "_Decline"
 msgstr "Av_slå"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "Godt_a"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "A_vslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "Gjør alle _tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "Godta _alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "_Oppdater"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "Start-tid:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "Slutt-tid:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "_Bevar min påminnelse"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "Arv påm_innelse"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1930
+msgid "_Tasks:"
+msgstr "_Oppgaver:"
+
+#: ../plugins/itip-formatter/itip-view.c:1932
 msgid "_Memos:"
 msgstr "_Notater:"
 
@@ -18869,11 +17920,8 @@ 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."
+msgstr "Spill av lyd fra lydtema når nye meldinger ankommer hvis ikke pip-modus er aktivert."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18895,7 +17943,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Use sound theme"
-msgstr ""
+msgstr "Bruk lydtema"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
@@ -18913,16 +17961,16 @@ msgstr "Om ikonet skal blinke eller ikke."
 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:292
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:313
+#: ../plugins/mail-notification/mail-notification.c:366
 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:422
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18937,56 +17985,67 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, c-format
+msgid "From: %s"
+msgstr "Fra: %s"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:518
+#, c-format
+msgid "Subject: %s"
+msgstr "Emne: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, 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:444
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:602
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:534
+#: ../plugins/mail-notification/mail-notification.c:630
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:640
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:825
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:765
+#: ../plugins/mail-notification/mail-notification.c:867
 msgid "Use sound _theme"
-msgstr ""
+msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:784
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:886
 msgid "Play _file:"
-msgstr "_Spill en lydfil"
+msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:795
+#: ../plugins/mail-notification/mail-notification.c:897
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:853
+#: ../plugins/mail-notification/mail-notification.c:955
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:862
+#: ../plugins/mail-notification/mail-notification.c:964
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
@@ -18998,7 +18057,13 @@ 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:394
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Opprettet av en e-post fra %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19007,7 +18072,7 @@ msgstr ""
 "Valgt kalender inneholder hendelsen «%s» allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:397
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19016,7 +18081,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder oppgave «%s» allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:400
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19025,7 +18090,7 @@ msgstr ""
 "Valgt notatliste inneholder notatet «%s» allerede. Vil du redigere det gamle "
 "notatet?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:417
+#: ../plugins/mail-to-task/mail-to-task.c:519
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -19033,7 +18098,7 @@ msgstr ""
 "Valgt kalender inneholder noen hendelser for disse e-postene allerede. Vil "
 "du lage nye hendelser likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:420
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -19041,7 +18106,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder noen oppgaver for disse meldingene allerede. "
 "Vil du lage nye oppgaver likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:525
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -19049,7 +18114,7 @@ msgstr ""
 "Valgt notatliste inneholder noen notater for disse meldingene allerede. Vil "
 "du lage nye notater likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:441
+#: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -19059,7 +18124,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:447
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -19069,7 +18134,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:453
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -19079,25 +18144,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:523
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke åpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:630
+#: ../plugins/mail-to-task/mail-to-task.c:732
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19105,7 +18170,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:633
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19113,7 +18178,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19121,40 +18186,40 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:957
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:959
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:964
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:966
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:971
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:973
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:981
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Create a _Meeting"
 msgstr "Lag et _møte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:983
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt møte fra den valgte meldingen"
 
@@ -19162,56 +18227,55 @@ msgstr "Lag et nytt møte fra den valgte meldingen"
 msgid "Convert a mail message to a task."
 msgstr "Konverter en e-postmelding til en oppgave."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:275
 msgid "Get List _Archive"
 msgstr "Hent liste_arkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:277
 msgid "Get an archive of the list this message belongs to"
 msgstr "Få et arkiv av listen denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:282
 msgid "Get List _Usage Information"
 msgstr "Hent informasjon om br_uk av liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:284
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Få informasjon om bruken av e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:289
 msgid "Contact List _Owner"
 msgstr "Eier av k_ontaktliste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Kontakt eieren til e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "_Post Message to List"
 msgstr "_Skriv e-post til liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Skriv en e-post til e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "_Subscribe to List"
 msgstr "_Abonner på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Abonner på e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
-#, fuzzy
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "Avslutt abonnementet på e-postlisten som denne e-posten hører til"
+msgstr "Avslutt abonnementet på e-postlisten som denne meldingen tilhører"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "Mailing _List"
 msgstr "E-post_liste"
 
@@ -19303,11 +18367,11 @@ msgstr "R_ediger melding"
 msgid "_Send message"
 msgstr "_Send melding"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Merk meldinger i undermapper også?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19315,15 +18379,15 @@ 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:172
+#: ../plugins/mark-all-read/mark-all-read.c:171
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:186
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:297
+#: ../plugins/mark-all-read/mark-all-read.c:342
 msgid "Mark Me_ssages as Read"
 msgstr "Merk meldinger _som lest"
 
@@ -19348,10 +18412,6 @@ msgstr "Tilleggshåndterer"
 msgid "Author(s)"
 msgstr "Fofatter(e)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
 #: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
@@ -19388,19 +18448,39 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "Foretrekk vanlig tekst"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr "La Evolution velge den beste delen å vise."
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr "Vis ren tekst hvis det finnes"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
-msgstr "Vis kun vanlig tekst"
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid "Only ever show plain text"
+msgstr "Vis kun ren tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr "Alltid vis ren tekst delen og vis de andre delene som vedlegg hvis forespurt."
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Vis _undertrykte HTML-deler som vedlegg"
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
@@ -19424,31 +18504,31 @@ msgstr "Outlook PST-import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:298
+#: ../plugins/pst-import/pst-importer.c:299
 msgid "_Mail"
 msgstr "_E-post"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "_Adressebok"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:335
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -19490,115 +18570,110 @@ msgstr "Publisering til %s fullført"
 msgid "Mount of %s failed:"
 msgstr "Montering av %s feilet:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:623
+#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "A_ktiver"
+
+#: ../plugins/publish-calendar/publish-calendar.c:629
 msgid "Are you sure you want to remove this location?"
 msgstr "Er du sikker på at du vil fjerne denne lokasjonen?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:937
+#: ../plugins/publish-calendar/publish-calendar.c:939
 msgid "Could not create publish thread."
 msgstr "Kunne ikke opprette tråd for publisering."
 
-#: ../plugins/publish-calendar/publish-calendar.c:944
+#: ../plugins/publish-calendar/publish-calendar.c:946
 msgid "_Publish Calendar Information"
 msgstr "_Publiser kalenderinformasjon"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Lokasjon</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "Egendefinert lokasjon"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Kilder</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "Daglig"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"Daglig\n"
-"Ukentlig\n"
-"Manuell (via menyen Handlinger)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (med pålogging)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "A_ktiver"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "Manuell (via menyen Handlinger)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "P_ort:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "Offentlig FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "Lokasjon for publisering"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "Publiserings_frekvens<"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"Sikker FTP (SSH)\n"
-"Offentlig FTP\n"
-"FTP (med pålogging)\n"
-"Delt Windows-ressurs\n"
-"WebDAV (HTTP)\n"
-"Sikker WebDAV (HTTPS)\n"
-"Egendefinert lokasjon"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "Sikker FTP (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "Sikker WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
-msgstr "_Type tjeneste:"
+msgstr "Type tjeneste:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "Kilder"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "Varig_het i tid:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "Ukentlig"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Delt Windows-ressurs"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "_Fil:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_Publiser som:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "Hu_sk passord"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"dager\n"
-"uker\n"
-"måneder"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"Ledig/opptatt"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -19606,11 +18681,11 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Kunne ikke publisere kalender: Kalendermotor eksisterer ikke lenger"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "Ny lokasjon"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "Rediger lokasjon"
 
@@ -19645,16 +18720,16 @@ msgstr "Venting på underprosess til SpamAssassin avbrutt. Terminerer..."
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Rør til SpamAssassin feilet. Feilkode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-msgid "SpamAssassin is not available."
-msgstr "SpamAssassin er ikke tilgjengelig."
+msgid "SpamAssassin is not available. Please install it first."
+msgstr "SpamAssassin er ikke tilgjengelig. Vennligst installer programmet først."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
@@ -19674,78 +18749,82 @@ msgstr "Alternativer for SpamAssassin"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:159
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "Beskrivelsesliste"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "Liste med kategorier"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "Liste med kommentarer"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "Prosent fullført"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "Deltakerliste"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "Endret"
 
-#: ../plugins/save-calendar/csv-format.c:522
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "A_dvanced options for the CSV format"
 msgstr "A_vanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:529
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a _header"
 msgstr "Legg til et _hode i starten"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "_Value delimiter:"
 msgstr "Skilletegn for _verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:543
 msgid "_Record delimiter:"
 msgstr "Skilletegn for poste_r:"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:550
 msgid "_Encapsulate values with:"
 msgstr "Pakk inn v_erdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar-format (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Lagre valgte"
@@ -19759,11 +18838,11 @@ msgstr "Lagre en kalender eller oppgaveliste til disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:371
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
@@ -19776,19 +18855,16 @@ msgid "Select destination file"
 msgstr "Velg målfil"
 
 #: ../plugins/save-calendar/save-calendar.c:323
-#, fuzzy
 msgid "Save the selected calendar to disk"
-msgstr "Lagre valgte meldinger som tekstfiler"
+msgstr "Lagre valgt kalender til disk"
 
 #: ../plugins/save-calendar/save-calendar.c:358
-#, fuzzy
 msgid "Save the selected memo list to disk"
-msgstr "Lagre valgte meldinger som tekstfiler"
+msgstr "Lagre valgt notatliste til disk"
 
 #: ../plugins/save-calendar/save-calendar.c:393
-#, fuzzy
 msgid "Save the selected task list to disk"
-msgstr "Lagre en kalender eller oppgaveliste til disk."
+msgstr "Lagre valgt oppgaveliste til disk"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19820,12 +18896,12 @@ msgstr ""
 "Vennligst klikk «Fremover» for å fortsette. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:129
+#: ../widgets/misc/e-import-assistant.c:386
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../shell/e-shell-importer.c:396
+#: ../widgets/misc/e-import-assistant.c:543
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -19834,14 +18910,11 @@ msgstr "Fra %s:"
 msgid "Importing files"
 msgstr "Importerer filer"
 
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:519
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "Importerer data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:538
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "Vennligst vent"
 
@@ -19874,15 +18947,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Tillegg for å lage maler av skisser"
 
-#: ../plugins/templates/templates.c:634
+#: ../plugins/templates/templates.c:617
 msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:705
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:707
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -19963,14 +19036,12 @@ 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"
+msgstr "Forvalgt X-koordinat for vinduet"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
-#, fuzzy
 msgid "Default window Y coordinate"
-msgstr "Forvalgt vindutilstand"
+msgstr "Forvalgt Y-koordinat for vinduet"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
@@ -20094,7 +19165,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:327
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -20111,14 +19182,12 @@ msgstr ""
 "(for eksempel «2.6.0»)."
 
 #: ../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."
+msgstr "Forvalgt X-koordinat for hovedvinduet."
 
 #: ../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."
+msgstr "Forvalgt Y-koordinat for hovedvinduet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
@@ -20251,123 +19320,35 @@ msgstr "Vindusknapper er synlige"
 #. * 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:867
+#: ../shell/e-shell-content.c:931
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:892
+#: ../shell/e-shell-content.c:956
 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:934
+#: ../shell/e-shell-content.c:998
 msgid "i_n"
 msgstr " _i"
 
-#: ../shell/e-shell-content.c:1357
+#: ../shell/e-shell-content.c:1495
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: ../shell/e-shell-content.c:1414 ../shell/e-shell-content.c:1415
+#: ../shell/e-shell-content.c:1557 ../shell/e-shell-content.c:1558
 msgid "Searches"
 msgstr "Søk"
 
-#: ../shell/e-shell-content.c:1460
+#: ../shell/e-shell-content.c:1604
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: ../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:122
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
-"er fra listen."
-
-#: ../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:132
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-"Evolution så etter innstillinger å importere for følgende\n"
-"programmer: Pine, Netscape, Elm, iCalendar. Ingen innstillinger\n"
-"som kunne importeres ble funnet. Hvis du vil prøve igjen\n"
-"kan du klikke på «Tilbake»-knappen.\n"
-
-#: ../shell/e-shell-importer.c:263
-msgid "F_ilename:"
-msgstr "F_ilnavn:"
-
-#: ../shell/e-shell-importer.c:268
-msgid "Select a file"
-msgstr "Velg en fil"
-
-#: ../shell/e-shell-importer.c:277
-msgid "File _type:"
-msgstr "Fil_type:"
-
-#: ../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:332
-msgid "Import a _single file"
-msgstr "Importer en en_kelt fil"
-
-#: ../shell/e-shell-importer.c:692 ../shell/e-shell-importer.c:706
-msgid "Evolution Import Assistant"
-msgstr "Importeringsassistent for Evolution"
-
-#: ../shell/e-shell-importer.c:701
-#, 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."
-
-#: ../shell/e-shell-importer.c:720
-msgid "Importer Type"
-msgstr "Type import"
-
-#: ../shell/e-shell-importer.c:733
-msgid "Select Information to Import"
-msgstr "Velg informasjon som skal importeres"
-
-#: ../shell/e-shell-importer.c:745
-msgid "Select a File"
-msgstr "Velg en fil"
-
-#: ../shell/e-shell-importer.c:754
-msgid "Import Location"
-msgstr "Importer lokasjon"
-
-#: ../shell/e-shell-importer.c:760
-#, 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:764
-msgid "Import File"
-msgstr "Importer fil"
-
 #: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
 #, c-format
 msgid "%ld KB"
@@ -20379,83 +19360,78 @@ msgstr "Stil for verktøylinje"
 
 #: ../shell/e-shell-switcher.c:447
 msgid "The switcher's toolbar style"
-msgstr ""
+msgstr "Verktøylinjestil for bytter"
 
-#: ../shell/e-shell-switcher.c:463
+#: ../shell/e-shell-switcher.c:463 ../shell/e-shell-window.c:715
 msgid "Toolbar Visible"
 msgstr "Verktøylinjen er synlig"
 
 #: ../shell/e-shell-switcher.c:464
-#, fuzzy
 msgid "Whether the switcher is visible"
-msgstr "Om sidelinjen skal være synlig."
+msgstr "Om bytter er synlig"
 
-#: ../shell/e-shell-view.c:485
-#, fuzzy
+#: ../shell/e-shell-view.c:486
 msgid "Switcher Action"
-msgstr "Bytt til %s"
+msgstr "Handling for bytter"
 
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-view.c:487
 msgid "The switcher action for this shell view"
-msgstr ""
+msgstr "Byttehandling for denne skallvisningen"
 
-#: ../shell/e-shell-view.c:501
-#, fuzzy
+#: ../shell/e-shell-view.c:502
 msgid "Page Number"
-msgstr "Serienummer"
+msgstr "Sidenummer"
 
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:503
 msgid "The notebook page number of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:520
+#: ../shell/e-shell-view.c:521
 msgid "The title of the shell view"
-msgstr ""
+msgstr "Tittel for skallvisningen"
 
-#: ../shell/e-shell-view.c:535
+#: ../shell/e-shell-view.c:536
 msgid "The EShellBackend for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:550
+#: ../shell/e-shell-view.c:551
 msgid "Shell Content Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:552
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:567
+#: ../shell/e-shell-view.c:568
 #, fuzzy
 msgid "Shell Sidebar Widget"
 msgstr "Forvalgt bredde på sidelinje"
 
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:569
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:583
+#: ../shell/e-shell-view.c:584
 msgid "Shell Taskbar Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:585
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 
-#: ../shell/e-shell-view.c:599
-#, fuzzy
+#: ../shell/e-shell-view.c:600
 msgid "Shell Window"
-msgstr "Nytt _vindu"
+msgstr "Skallvindu"
 
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:601
 msgid "The window to which the shell view belongs"
-msgstr ""
+msgstr "Vindu skallvisningen tilhører"
 
-#: ../shell/e-shell-view.c:615
-#, fuzzy
+#: ../shell/e-shell-view.c:616
 msgid "Current View ID"
-msgstr "_Aktiv visning"
+msgstr "Aktiv visnings-ID"
 
-#: ../shell/e-shell-view.c:616
+#: ../shell/e-shell-view.c:617
 #, fuzzy
 msgid "The current GAL view ID"
 msgstr "Lagre aktiv egendefinert visning"
@@ -20463,381 +19439,413 @@ 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-actions.c:644
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1248
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1254
+#: ../shell/e-shell-window-actions.c:1250
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjøres."
 
-#: ../shell/e-shell-window-actions.c:1356
+#: ../shell/e-shell-window-actions.c:1352
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1358
+#: ../shell/e-shell-window-actions.c:1354
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot kunne ikke kjøres."
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1453
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1464
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1466
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Open the Evolution User Guide"
-msgstr "Åpne annen brukers mappe"
+msgstr "Åpne Evolutions brukermanual"
 
-#: ../shell/e-shell-window-actions.c:1471
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Evolution _FAQ"
 msgstr "Evolution _OSS"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Åpne nettside med ofte stilte spørsmål"
 
-#: ../shell/e-shell-window-actions.c:1478
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "_Glem passord"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Glem alle lagrede passord"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1494
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
-msgstr "Opprett et nytt vindu som viser denne mappen"
+msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1501
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1502
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1508
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Show Evolution's shortcut keys"
-msgstr "Endre innstillinger for Evolution"
+msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Advanced Search..."
 msgstr "_Avansert søk..."
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Construct a more advanced search"
-msgstr ""
+msgstr "Sett sammen et mer avansert søk"
 
-#: ../shell/e-shell-window-actions.c:1529
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Clear the current search parameters"
-msgstr "Tøm søk"
+msgstr "Tøm aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
-#: ../shell/e-shell-window-actions.c:1536
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Manage your saved searches"
-msgstr "Håndter e-post, kontakter og kalender"
+msgstr "Håndter dine lagrede søk"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Find Now"
 msgstr "_Finn nå "
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1550
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Execute the current search parameters"
-msgstr "Avbryt aktiv e-postoperasjon"
+msgstr "Kjør aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1551
 msgid "_Save Search..."
 msgstr "_Lagre søk..."
 
-#: ../shell/e-shell-window-actions.c:1557
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Save the current search parameters"
-msgstr "Lagre aktiv fil"
+msgstr "Lagre aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1560
 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:1569
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport..."
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Synchronization Options..."
 msgstr "Alternativer for _synkronisering..."
 
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1579
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1585
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Put Evolution into offline mode"
-msgstr "Start i frakoblet modus"
+msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1592
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into online mode"
-msgstr "Start i tilkoblet modus"
+msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1620
+#: ../shell/e-shell-window-actions.c:1616
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1627
+#: ../shell/e-shell-window-actions.c:1623
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../shell/e-shell-window-actions.c:1641
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1651
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1661
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1663
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1669
+msgid "Show _Buttons"
+msgstr "Vis _knapper"
+
+#: ../shell/e-shell-window-actions.c:1671
+msgid "Show the switcher buttons"
+msgstr "Vis knapper for bytter"
+
+#: ../shell/e-shell-window-actions.c:1677
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1681
-msgid "Show _Buttons"
-msgstr "Vis _knapper"
-
-#: ../shell/e-shell-window-actions.c:1683
-#, fuzzy
-msgid "Show the switcher buttons"
-msgstr "Vis den andre tidssonen"
-
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1685
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1691
-msgid "Show the toolbar"
+#: ../shell/e-shell-window-actions.c:1687
+msgid "Show the tool bar"
 msgstr "Vis verktøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1709
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1716
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1725
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Tool_bar Style"
 msgstr "S_til for verktøylinje"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1756
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1782
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Change the page settings for your current printer"
-msgstr "Sett opp sideinnstillinger for din skriver"
+msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2054
+#: ../shell/e-shell-window-actions.c:2066
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2257
+#: ../shell/e-shell-window-actions.c:2269
 msgid "Execute these search parameters"
-msgstr ""
-
-#: ../shell/e-shell-window-private.c:252
-msgid "New"
-msgstr "Ny"
+msgstr "Kjør disse søkeparameterene"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:569
+#: ../shell/e-shell-window-private.c:551
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:292
+#: ../shell/e-shell-window.c:353
+msgid "New"
+msgstr "Ny"
+
+#: ../shell/e-shell-window.c:606
 msgid "Active Shell View"
-msgstr ""
+msgstr "Aktiv skallvisning"
 
-#: ../shell/e-shell-window.c:293
-#, fuzzy
+#: ../shell/e-shell-window.c:607
 msgid "Name of the active shell view"
-msgstr "Navn på ny visning:"
+msgstr "Navn på aktiv skallvisning"
+
+#: ../shell/e-shell-window.c:621 ../shell/e-shell.c:772
+msgid "Geometry"
+msgstr "Geometri"
 
-#: ../shell/e-shell-window.c:307
+#: ../shell/e-shell-window.c:622 ../shell/e-shell.c:773
+msgid "Initial window geometry string"
+msgstr "Initiell geometristreng for vindu"
+
+#: ../shell/e-shell-window.c:637
 msgid "Safe Mode"
 msgstr "Trygg modus"
 
-#: ../shell/e-shell-window.c:308
-#, fuzzy
+#: ../shell/e-shell-window.c:638
 msgid "Whether the shell window is in safe mode"
-msgstr "Om tillegget er aktivert"
+msgstr "Om tillegget er i sikker modus"
 
-#: ../shell/e-shell-window.c:339
+#: ../shell/e-shell-window.c:669
+msgid "Sidebar Visible"
+msgstr "Sidelinjen er synlig"
+
+#: ../shell/e-shell-window.c:670
 #, fuzzy
+msgid "Whether the shell window's side bar is visible"
+msgstr "Om sidelinjen skal være synlig."
+
+#: ../shell/e-shell-window.c:684
+msgid "Switcher Visible"
+msgstr "Bytter er synlig"
+
+#: ../shell/e-shell-window.c:685
+#, fuzzy
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "Om vinduknappene skal være synlige."
+
+#: ../shell/e-shell-window.c:700
+msgid "Taskbar Visible"
+msgstr "Oppgaveliste er synlig"
+
+#: ../shell/e-shell-window.c:701
+#, fuzzy
+msgid "Whether the shell window's task bar is visible"
+msgstr "Om sidelinjen skal være synlig."
+
+#: ../shell/e-shell-window.c:716
+#, fuzzy
+msgid "Whether the shell window's tool bar is visible"
+msgstr "Om sidelinjen skal være synlig."
+
+#: ../shell/e-shell-window.c:730
 msgid "UI Manager"
-msgstr "Leder"
+msgstr "UI-håndterer"
 
-#: ../shell/e-shell-window.c:340
+#: ../shell/e-shell-window.c:731
 msgid "The shell window's GtkUIManager"
 msgstr ""
 
-#: ../shell/e-shell.c:207
-#, fuzzy
+#: ../shell/e-shell.c:213
 msgid "Preparing to go offline..."
-msgstr "Forbereder konto «%s» for frakoblet bruk"
+msgstr "Forbereder frakoblet bruk..."
 
-#: ../shell/e-shell.c:261
-#, fuzzy
+#: ../shell/e-shell.c:267
 msgid "Preparing to go online..."
-msgstr "Forbereder konto «%s» for frakoblet bruk"
+msgstr "Forbereder tilkoblet bruk..."
 
-#: ../shell/e-shell.c:324
+#: ../shell/e-shell.c:339
 msgid "Preparing to quit..."
-msgstr ""
+msgstr "Forbereder avslutting..."
 
-#: ../shell/e-shell.c:688
+#: ../shell/e-shell.c:788
+msgid "Module Directory"
+msgstr "Modulkatalog"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr "Katalog for lasting av EModuler"
+
+#: ../shell/e-shell.c:804
 msgid "Network Available"
 msgstr "Nettverk tilgjengelig"
 
-#: ../shell/e-shell.c:689
+#: ../shell/e-shell.c:805
 msgid "Whether the network is available"
 msgstr "Om nettverket er tilgjengelig"
 
-#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../shell/e-shell.c:705
+#: ../shell/e-shell.c:821
 msgid "Whether the shell is online"
 msgstr "Om skallet er tilkoblet"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:176
+#: ../shell/main.c:159
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20872,7 +19880,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:200
+#: ../shell/main.c:183
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20880,39 +19888,51 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:190
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:310
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:312
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:332
-msgid "Forcibly shut down all Evolution components"
-msgstr "Steng ned alle komponenter i Evolution"
+#: ../shell/main.c:319
+msgid "Forcibly shut down Evolution"
+msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:323
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:339
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:341
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:343
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:494
+#: ../shell/main.c:334
+msgid "Import URIs or file names given as rest of arguments."
+msgstr "Importer URIer eller filnavn gitt som argumenter."
+
+#: ../shell/main.c:336
+msgid "Request a running Evolution process to quit"
+msgstr "Be en kjørende Evolution-prosess om å stenge ned"
+
+#: ../shell/main.c:493
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
@@ -21021,43 +20041,38 @@ msgid "_Remind Me Later"
 msgstr "_Vis påminnelse senere"
 
 #: ../shell/shell.error.xml.h:25
-#, fuzzy
 msgid ""
 "{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
-"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
-"gamle data.\n"
+"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"
+msgstr "_Testoppføring"
 
 #: ../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"
+msgstr "Te_stkilde"
 
 #: ../shell/test/e-test-shell-backend.c:72
-#, fuzzy
 msgid "Create a new test source"
-msgstr "Opprett en ny testoppføring"
+msgstr "Opprett en ny testkilde"
 
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "Filen er ikke en gyldig .desktop-fil"
 
 #: ../smclient/eggdesktopfile.c:188
 #, c-format
@@ -21101,11 +20116,11 @@ msgstr "Konfigurer Pilot"
 
 #: ../smclient/eggsmclient.c:228
 msgid "FILE"
-msgstr ""
+msgstr "FIL"
 
 #: ../smclient/eggsmclient.c:231
 msgid "Specify session management ID"
-msgstr ""
+msgstr "Oppgi sesjonshåndterings-ID"
 
 #: ../smclient/eggsmclient.c:231
 msgid "ID"
@@ -21113,14 +20128,13 @@ msgstr "ID"
 
 #: ../smclient/eggsmclient.c:252
 msgid "Session management options:"
-msgstr ""
+msgstr "Alternativer for sesjonshåndtering:"
 
 #: ../smclient/eggsmclient.c:253
-#, fuzzy
 msgid "Show session management options"
-msgstr "Vis bildeanimasjoner"
+msgstr "Vis alternativer for sesjonshåndtering"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21131,7 +20145,7 @@ msgstr ""
 "\n"
 "Rediger innstillinger for tillit:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21141,7 +20155,7 @@ msgstr ""
 "stoler du også på at dette sertifikatet er autentisk med mindre annet "
 "indikeres her"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21151,59 +20165,59 @@ msgstr ""
 "sertifikatet stoler du heller ikke på at dette sertifikatet er autentisk med "
 "mindre annet indikeres her"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:384
-#: ../smime/gui/certificate-manager.c:612
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:399
-#: ../smime/gui/certificate-manager.c:626
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:489
-#: ../smime/gui/certificate-manager.c:714
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/certificate-manager.c:507
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:35
 #: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:302
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "Utgår"
 
-#: ../smime/gui/certificate-manager.c:393
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "Alle sertifikatfiler for e-post"
 
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:1046
 msgid "Certificates"
 msgstr "Sertifikater"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
@@ -21223,7 +20237,7 @@ msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21232,7 +20246,7 @@ msgstr ""
 "Utstedt til:\n"
 "  Subjekt: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21241,59 +20255,27 @@ msgstr ""
 "Utstedt av:\n"
 "  Subjekt: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ikke en del av sertifikatet>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>Sertifikatfelt</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>Sertifikathierarki</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>Feltverdi</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>Fingeravtrykk</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>Utstedt av</b> "
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>Utstedt til</b> "
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>Dette sertifikatet er verifisert for følgende bruk:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>Gyldighet</b> "
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "Autoriteter"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "Sikkerhetskopier"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "Sikkerhetskopier alle"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21301,129 +20283,161 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "Tillit til sertifikatmyndighet"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr "Sertifikatfelt"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr "Sertifikathierarki"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "Tabell med sertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Dummy window only"
 msgstr "Dummyvindu"
 
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Certificate Trust Settings"
 msgstr "Innstillinger for tillit til e-postsertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Expires On"
 msgstr "Utgår"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Field Value"
+msgstr "Feltverdi"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Fingerprints"
+msgstr "Fingeravtrykk"
+
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Import"
 msgstr "Importer"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "Issued By"
+msgstr "Utstedt av"
+
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Issued To"
+msgstr "Utstedt til"
+
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:34 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:36
+msgid "This certificate has been verified for the following uses:"
+msgstr "Dette sertifikatet er verifisert for følgende bruk:"
+
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:41
+msgid "Validity"
+msgstr "Gyldighet"
+
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "View"
 msgstr "Vis"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
@@ -21607,19 +20621,6 @@ msgstr "Oppgi passord for PKCS12-fil:"
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "Kunne ikke kjøre «%s»: %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Stenger ned %s (%s)\n"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
@@ -21693,31 +20694,27 @@ msgid "With _Status"
 msgstr "Med _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:418
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:422
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>Tidssoner</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_Utvalg</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "Velg en tidssone"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "Tidssoner"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "Kombinasjonsboks med nedtrekksvalg for tidssone"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21727,23 +20724,27 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Utvalg"
+
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Samling"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:350
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definer visninger for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:360
 msgid "Define Views"
 msgstr "Definer visninger"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Definer visninger for «%s»"
@@ -21758,15 +20759,15 @@ msgstr "Tabell"
 msgid "Instance"
 msgstr "Instans"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Lagre aktiv visning"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Opprett en ny visning"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
@@ -21774,19 +20775,19 @@ msgstr "E_rstatt eksisterende visning"
 msgid "Factory"
 msgstr "Factory"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:99
 msgid "Define New View"
 msgstr "Definer ny visning"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "Navn på ny visning:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "Type visning"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Type visning:"
 
@@ -21810,30 +20811,6 @@ msgstr "Handling"
 msgid "A GtkRadioAction"
 msgstr ""
 
-#. Translators: This is a cancelled activity.
-#: ../widgets/misc/e-activity.c:224
-#, c-format
-msgid "%s (cancelled)"
-msgstr "%s (avbrutt)"
-
-#. Translators: This is a completed activity.
-#: ../widgets/misc/e-activity.c:227
-#, c-format
-msgid "%s (completed)"
-msgstr "%s (fullført)"
-
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../widgets/misc/e-activity.c:231
-#, c-format
-msgid "%s..."
-msgstr "%s..."
-
-#: ../widgets/misc/e-activity.c:236
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% fullført)"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Egenskaper for vedlegg"
@@ -21846,6 +20823,11 @@ msgstr "_Filnavn:"
 msgid "MIME Type:"
 msgstr "MIME-type:"
 
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
+msgid "_Suggest automatic display of attachment"
+msgstr "Fore_slå automatisk visning av vedlegg"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "Kunne ikke sette som bakgrunn"
@@ -21879,10 +20861,13 @@ msgid "Saving"
 msgstr "Lagrer"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+msgid "Show Attachment _Bar"
+msgstr "Vis ve_dleggsfelt"
+
 #: ../widgets/misc/e-attachment-paned.c:626
 msgid "Show _Attachment Bar"
 msgstr "Vis ve_dleggsfelt"
@@ -21903,7 +20888,7 @@ 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
+#: ../widgets/misc/e-attachment.c:1768 ../widgets/misc/e-attachment.c:2294
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
@@ -21937,48 +20922,53 @@ msgstr "Åpne dette vedlegget i %s"
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2596
 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
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2604
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste «%s»"
 
-#: ../widgets/misc/e-attachment.c:1926
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2190
+#: ../widgets/misc/e-attachment.c:2174
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../widgets/misc/e-attachment.c:2193
+#: ../widgets/misc/e-attachment.c:2177
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke åpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2635
+#: ../widgets/misc/e-attachment.c:2612
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2712
+#: ../widgets/misc/e-attachment.c:2688
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre «%s»"
 
-#: ../widgets/misc/e-attachment.c:2715
+#: ../widgets/misc/e-attachment.c:2691
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
 
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../widgets/misc/e-buffer-tagger.c:359
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl-klikk for å åpne en lenke"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
@@ -22059,44 +21049,137 @@ msgstr "Skriv inn tegnsett som skal brukes"
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-dateedit.c:408
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:428
+#: ../widgets/misc/e-dateedit.c:543
 msgid "Text entry to input date"
 msgstr "Tekstfelt for å oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:450
+#: ../widgets/misc/e-dateedit.c:565
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:607
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid"
 
-#: ../widgets/misc/e-dateedit.c:568
+#: ../widgets/misc/e-dateedit.c:683
 msgid "No_w"
 msgstr "N_å"
 
-#: ../widgets/misc/e-dateedit.c:574
+#: ../widgets/misc/e-dateedit.c:689
 msgid "_Today"
 msgstr "I _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:582
+#: ../widgets/misc/e-dateedit.c:697
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../widgets/misc/e-dateedit.c:1675
+#: ../widgets/misc/e-dateedit.c:1797
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1705
+#: ../widgets/misc/e-dateedit.c:1833
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
+#: ../widgets/misc/e-import-assistant.c:239
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
+"er fra listen."
+
+#: ../widgets/misc/e-import-assistant.c:256
+msgid "F_ilename:"
+msgstr "F_ilnavn:"
+
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "Select a file"
+msgstr "Velg en fil"
+
+#: ../widgets/misc/e-import-assistant.c:280
+#: ../widgets/misc/e-import-assistant.c:456
+msgid "File _type:"
+msgstr "Fil_type:"
+
+#: ../widgets/misc/e-import-assistant.c:323
+msgid "Choose the destination for this import"
+msgstr "Velg mål det skal importeres til"
+
+#: ../widgets/misc/e-import-assistant.c:348
+msgid "Choose the type of importer to run:"
+msgstr "Velg type importerer som skal kjøres:"
+
+#: ../widgets/misc/e-import-assistant.c:356
+msgid "Import data and settings from _older programs"
+msgstr "Importer data og innstillinger fra _eldre programmer"
+
+#: ../widgets/misc/e-import-assistant.c:364
+msgid "Import a _single file"
+msgstr "Importer en en_kelt fil"
+
+#: ../widgets/misc/e-import-assistant.c:440
+msgid "Select what type of file you want to import from the list."
+msgstr ""
+
+#: ../widgets/misc/e-import-assistant.c:517
+#, fuzzy
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution så etter innstillinger å importere for følgende\n"
+"programmer: Pine, Netscape, Elm, iCalendar. Ingen innstillinger\n"
+"som kunne importeres ble funnet. Hvis du vil prøve igjen\n"
+"kan du klikke på «Tilbake»-knappen.\n"
+
+#: ../widgets/misc/e-import-assistant.c:1181
+#: ../widgets/misc/e-import-assistant.c:1208
+msgid "Evolution Import Assistant"
+msgstr "Importeringsassistent for Evolution"
+
+#: ../widgets/misc/e-import-assistant.c:1190
+#: ../widgets/misc/e-import-assistant.c:1242
+msgid "Import Location"
+msgstr "Importer lokasjon"
+
+#: ../widgets/misc/e-import-assistant.c:1201
+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 eksterne filer til Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1217
+msgid "Importer Type"
+msgstr "Type import"
+
+#: ../widgets/misc/e-import-assistant.c:1226
+msgid "Select Information to Import"
+msgstr "Velg informasjon som skal importeres"
+
+#: ../widgets/misc/e-import-assistant.c:1234
+msgid "Select a File"
+msgstr "Velg en fil"
+
+#: ../widgets/misc/e-import-assistant.c:1249
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1265
+msgid "Import Data"
+msgstr "Importer data"
+
 #: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Verdenskart"
@@ -22110,43 +21193,34 @@ msgstr ""
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
 #: ../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."
+msgstr "Evolution er koblet til. 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."
+msgstr "Evolution er frakoblet. 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."
+msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
 #: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "Knappetilstanden er tilkoblet"
 
-#: ../widgets/misc/e-paned.c:180
+#: ../widgets/misc/e-paned.c:244
 msgid "Horizontal Position"
 msgstr "Horisontal posisjon"
 
-#: ../widgets/misc/e-paned.c:181
+#: ../widgets/misc/e-paned.c:245
 msgid "Pane position when oriented horizontally"
 msgstr ""
 
-#: ../widgets/misc/e-paned.c:192
+#: ../widgets/misc/e-paned.c:256
 msgid "Vertical Position"
 msgstr "Vertikal posisjon"
 
-#: ../widgets/misc/e-paned.c:193
+#: ../widgets/misc/e-paned.c:257
 msgid "Pane position when oriented vertically"
 msgstr ""
 
@@ -22162,16 +21236,7 @@ msgstr "Synkroniser private oppføringer:"
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: ../widgets/misc/e-popup-action.c:173
-#, fuzzy
-msgid "Source Action"
-msgstr "Kildekonto"
-
-#: ../widgets/misc/e-popup-action.c:174
-msgid "The source action to proxy"
-msgstr ""
-
-#: ../widgets/misc/e-preferences-window.c:216
+#: ../widgets/misc/e-preferences-window.c:218
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
@@ -22197,136 +21262,115 @@ msgstr "Utvalgsmodus"
 msgid "Cursor Mode"
 msgstr "Markørmodus"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>Alternativer for levering</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>Svar</b> "
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>Returvarsling</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>Statusoppfølging</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "Slett sendt-oppføring a_utomatisk"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "Oppr_ett en sendt-oppføring for å spore informasjonen"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "Le_vert og åpnet"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "Alternativer for levering"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr "Kun for dine øyne"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "Gene_relle alternativer"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"Ingen\n"
-"E-postkvittering"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
+msgstr "E-postkvittering"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"Normal\n"
-"Godseid\n"
-"Konfidensiell\n"
-"Hemmelig\n"
-"Topphemmelig\n"
-"Kun for dine øyne"
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Proprietary"
+msgstr "Proprietær"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "R_eply requested"
 msgstr "Svar for_espurt"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:16
+msgid "Return Notification"
+msgstr "Returvarsling"
+
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusoppfølging"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"Udefinert\n"
-"Høy\n"
-"Standard\n"
-"Lav"
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Standard"
+msgstr "Standard"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Status Tracking"
+msgstr "Statusoppfølging"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Top Secret"
+msgstr "Topphemmelig"
+
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "When acce_pted:"
 msgstr "Ved go_dkjenning:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When co_mpleted:"
 msgstr "Ved full_føring:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When decli_ned:"
 msgstr "Ved _avslag:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Wi_thin"
 msgstr "I_nnen"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "_After:"
 msgstr "_Etter:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_All information"
 msgstr "_All informasjon"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_Classification:"
 msgstr "_Klassifisering:"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Delay message delivery"
 msgstr "_Utsett meldingslevering"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delivered"
 msgstr "_Levert"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Set expiration date"
 msgstr "_Sett utløpsdato"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Until:"
 msgstr "_Inntil:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_When convenient"
 msgstr "_Når det passer"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When opened:"
 msgstr "_Ved åpning:"
 
@@ -22350,84 +21394,78 @@ 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"
+msgstr "Rediger signaturskript"
 
 #: ../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."
+"signatur. Navnet du oppgir vil kun brukes for\n"
+"visning på skjermen."
 
 #: ../widgets/misc/e-signature-script-dialog.c:311
-#, fuzzy
 msgid "S_cript:"
-msgstr "_Skript:"
+msgstr "S_kript:"
 
 #: ../widgets/misc/e-signature-script-dialog.c:342
-#, fuzzy
 msgid "Script file must be executable."
-msgstr "Skriptfilen må eksistere og være kjørbar."
+msgstr "Skriptfilen må 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/e-web-view.c:305
-#, fuzzy
+#: ../widgets/misc/e-web-view.c:340
+msgid "_Copy Link Location"
+msgstr "_Kopier lokasjon for lenke"
+
+#: ../widgets/misc/e-web-view.c:342
 msgid "Copy the link to the clipboard"
-msgstr "Kopier objekter til utklippstavlen"
+msgstr "Kopier lenken til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:315
-#, fuzzy
-msgid "Open the link in a web browser"
+#: ../widgets/misc/e-web-view.c:350
+msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: ../widgets/misc/e-web-view.c:323
-#, fuzzy
-msgid "_Copy Email Address"
-msgstr "Kopier _e-postadresse"
+#: ../widgets/misc/e-web-view.c:352
+msgid "Open the link in a web browser"
+msgstr "Åpne lenken i en nettleser"
 
-#: ../widgets/misc/e-web-view.c:325
-#, fuzzy
-msgid "Copy the email address to the clipboard"
-msgstr "Kopier objekter til utklippstavlen"
+#: ../widgets/misc/e-web-view.c:360
+msgid "_Copy Email Address"
+msgstr "_Kopier e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:332
-#, fuzzy
-msgid "Send a mail message to this address"
-msgstr "Konverter en e-postmelding til en oppgave."
+#: ../widgets/misc/e-web-view.c:379
+msgid "Copy the selection to the clipboard"
+msgstr "Kopier utvalget til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:574
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klikk for å sende melding til %s"
+#: ../widgets/misc/e-web-view.c:389
+msgid "Select all text and images"
+msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:576 ../widgets/misc/e-web-view.c:578
-#: ../widgets/misc/e-web-view.c:580
+#: ../widgets/misc/e-web-view.c:710 ../widgets/misc/e-web-view.c:712
+#: ../widgets/misc/e-web-view.c:714
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../widgets/misc/e-web-view.c:582
+#: ../widgets/misc/e-web-view.c:716
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:584
+#: ../widgets/misc/e-web-view.c:718
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
@@ -22479,136 +21517,136 @@ msgstr "Kolonne med fokus"
 msgid "Unselected Column"
 msgstr "Ikke-valgt kolonne"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Strikeout Column"
 msgstr "Uthev kolonne"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Underline Column"
 msgstr "Understrek kolonne"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Bold Column"
 msgstr "Fet kolonne"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Color Column"
 msgstr "Farget kolonne"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1836
 msgid "BG Color Column"
 msgstr "Kolonne for bakgrunnsfarge"
 
-#: ../widgets/table/e-table-click-to-add.c:578
+#: ../widgets/table/e-table-click-to-add.c:576
 #: ../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
+#: ../widgets/table/e-table-config.c:151
 msgid "State"
 msgstr "Tilstand"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Ascending)"
 msgstr "(Stigende)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Descending)"
 msgstr "(Synkende)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:389
 msgid "Not sorted"
 msgstr "Ikke sortert"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:430
 msgid "No grouping"
 msgstr "Ingen gruppering"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Vis felter"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:657
 msgid "Available Fields"
 msgstr "Tilgjengelige felt"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "Fjern alt"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "Fjern _alt"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Descending"
 msgstr "Synkende"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Grupper elementer etter"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "Flytt _ned"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "Flytt _opp"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "Vis _felt i visning"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "Vis felt i vis_ning"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "Vis felt i _visning"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "Sorter"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "Sorter elementer etter"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "Så etter"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "_Viste felt..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "_Grupper etter..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "Vi_s felt i visning"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "_Vis disse feltene i rekkefølge:"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "_Sorter..."
 
@@ -22616,11 +21654,7 @@ msgstr "_Sorter..."
 msgid "Add a column..."
 msgstr "Legg til en kolonne..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "Feltvelger"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22720,60 +21754,60 @@ msgstr "Enhetlig høyde på rad"
 msgid "Frozen"
 msgstr "Frosset"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1450
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "Format Column_s..."
 msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1540
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "_Custom"
 msgstr "E_gendefinert"
 
@@ -22802,6 +21836,14 @@ msgstr "Alltid søk"
 msgid "Use click to add"
 msgstr "Bruk klikk for å legge til"
 
+#: ../widgets/table/e-table.c:3351
+msgid "Vertical Row Spacing"
+msgstr "Vertikalt mellomrom for rader"
+
+#: ../widgets/table/e-table.c:3352
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr "Vertikalt mellomrom mellom rader. Legges til topp og bunn på en rad"
+
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
author	Kjartan Maraas <kmaraas@gnome.org>	2009-12-05 19:14:08 +0800
committer	Kjartan Maraas <kmaraas@gnome.org>	2009-12-05 19:14:08 +0800
commit	2400e28ab622bbb7bc3c7fe889c422d825c4b87c (patch)
tree	989dde41c3193700af92e393cf68ee1fe96c2cc5 /po/nb.po
parent	380aca61772460ddf8544049b84d67137773d86b (diff)
download	gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.gz gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.bz2 gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.lz gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.xz gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.tar.zst gsoc2013-evolution-2400e28ab622bbb7bc3c7fe889c422d825c4b87c.zip