Updated Norwegian Nynorsk translation.

2008-03-03 Åsmund Skjæveland <aasmunds@ulrik.uio.no> * nn.po: Updated Norwegian Nynorsk translation. svn path=/trunk/; revision=35112
author: Åsmund Skjæveland <aasmunds@ulrik.uio.no> 2008-03-03 07:27:47 +0800
committer: Åsmund Skjæveland <aasmunds@src.gnome.org> 2008-03-03 07:27:47 +0800
commit: 0d8b515e44c6c09708527027b8fc847234e5bd2b (patch)
tree: a53a2dbc190ed1e19414687c8d11ab81f6ac0478 /po/nn.po
parent: a47b2e99b51ed8a3e46c31a2111ddd212d8bbcf4 (diff)
download: gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar
gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.gz
gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.bz2
gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.lz
gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.xz
gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.zst
gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.zip
1 files changed, 5709 insertions, 4301 deletions
diff --git a/po/nn.po b/po/nn.po
index aec2c3558c..965b7dcb14 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,37 +6,38 @@
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001-2002.
 # Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003, 2004, 2005, 2006.
 # Sigurd Gartmann <sigurdga@europe.yahoo-inc.com>, 2005.
-#: ../mail/em-format-html-display.c:684
+# Åsmund Skjæveland <aasmunds@ulrik.uio.no>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-25 22:53+0200\n"
-"PO-Revision-Date: 2006-09-17 23:10+0200\n"
-"Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
+"POT-Creation-Date: 2008-03-03 00:27+0100\n"
+"PO-Revision-Date: 2008-03-03 00:26+0100\n"
+"Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -44,7 +45,7 @@ msgstr[0] "noverande adressebokmappe %s har %d kort"
 msgstr[1] "noverande adressebokmappe %s har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Opna"
 
@@ -85,7 +86,7 @@ msgstr "Kalenderhending: Har ikkje samandrag."
 msgid "calendar view event"
 msgstr "kalenderframsyningshending"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
@@ -109,7 +110,7 @@ msgstr "Gå til i dag"
 msgid "Go to Date"
 msgstr "Gå til dato"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "ein tabell til å visa og velja aktuelt tidsrom med"
@@ -154,7 +155,7 @@ msgid "calendar view for one or more days"
 msgstr "kalenderframsyning for ein eller fleire dagar"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:747
 msgid "%A %d %b %Y"
 msgstr "%d. %a %b %Y"
 
@@ -165,9 +166,9 @@ msgstr "%d. %a %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1363
+#: ../calendar/gui/e-day-view.c:2162
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -176,9 +177,9 @@ msgstr "%d. %a %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
@@ -186,10 +187,10 @@ msgstr "%d. %a %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -199,25 +200,25 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1367
+#: ../calendar/gui/e-day-view.c:2178
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "søkjelinje"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "Evolution kalendersøkjelinje"
 
@@ -256,11 +257,11 @@ msgstr "oppsprett"
 msgid "popup a child"
 msgstr "opna ein barneprosess"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "rediger"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "start å redigera denne cella"
 
@@ -273,19 +274,19 @@ msgstr "slå av og på"
 msgid "toggle the cell"
 msgstr "slå av og på cella"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "utvid"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "utvidar raden i E-treet som inneheld denne cella"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "slå saman"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår saman raden i E-treet som inneheld denne cella"
 
@@ -295,7 +296,7 @@ msgstr "Tabellcelle"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "klikk for å leggja til"
 
@@ -307,17 +308,17 @@ msgstr "klikk"
 msgid "sort"
 msgstr "sortér"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalender: frå %s til %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "Evolution kalenderelement"
 
@@ -341,7 +342,17 @@ msgstr "Slå av/på vedleggslinje"
 msgid "activate"
 msgstr "aktiver"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
+msgid ""
+"'{0}' is a read-only address book source. Switch to Contacts View and "
+"highlight an address book that can accept contacts."
+msgstr ""
+"Du har vald ei skrivebeskytta kalendarkjelde. Byt til kalenderframsyninga og "
+"vel ein kalender som tek imot avtalar."
+
+#: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -349,19 +360,23 @@ msgstr ""
 "Ein kontakt med denne adressa finst frå før. Vil du leggja til ein ny "
 "kontakt med den same adressa?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "Adressa «{0}» finst frå før."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "Kan ikkje leggja til ny kontakt"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Kan ikkje flytta kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -371,15 +386,15 @@ msgstr ""
 "som er støtta. Hugs at mange passord er kjenslevare for små og store "
 "bokstavar. Sjå etter om Caps Lock er på."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikkje henta skjemainformasjon om LDAP-tenaren."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove addressbook."
 msgstr "Klarte ikkje å sletta adresseboka."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:11
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
@@ -389,59 +404,59 @@ msgstr ""
 "annan GroupWise-klient ein gong, for å få adgang til mappene med GroupWise "
 "ofte brukte kontaktar og GroupWise personlege kontaktar."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Sletta adresseboka «{0}»?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading addressbook."
 msgstr "Feil ved lasting av addressebok."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Feil under lagring av {0} til {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Klarte ikkje å autentisera mot IMAP-tenar."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
 msgid "Failed to delete contact"
 msgstr "Klarte ikkje å sletta kontakten"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "Lagar GroupWise adressebok:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tenaren svarte ikkje med gyldig skjemainformasjon."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Permission Denied."
 msgstr "Nekta tilgang."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Tenarversjon"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Some features may not work properly with your current server"
 msgstr "Somme eigenskapar vil kanskje ikkje virka ordentleg med tenaren din"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution-adresseboka har avslutta uventa."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -451,20 +466,20 @@ msgstr ""
 "funksjonen. Han kan óg vera feil stilt inn. Spør din systemansvarlege om "
 "støtta søkjebasar."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboka vil fjernast for godt."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook could not be opened."
 msgstr "Denne adresseboka kan ikkje opnast."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Denne adresseboktenaren har ikkje nokon tilrådd søkjebasis."
 
 # TRN: Feilmeld manglande "be"
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -472,28 +487,28 @@ msgstr ""
 "Det er ikkje mogleg å nå fram til denne adresseboktenaren eller så er "
 "tenarnamnet feilstava, eller nettverkstilkoplinga di kan vera nede."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tenaren støttar ikkje LDAPv3-skjemainformasjon."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to perform search."
 msgstr "Kan ikkje utføra søk."
 
 # TRN: Feil plural.
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Unable to save {0}."
 msgstr "Kan ikkje lagra {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagra endringane?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -501,7 +516,7 @@ msgstr ""
 "Kontakten du prøver å flytta frå ei adressebok til ei anna kan ikkje "
 "slettast frå kjelda. Vil du kopiera han i staden?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -511,50 +526,64 @@ msgstr ""
 "Evolution. For å få best resultat bør tenaren oppgraderast til ein støtta "
 "versjon"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Du har endra denne kontakten. Vil du lagra endringane?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Kontaktane dine for {0} vil ikkje vera tilgjengelege før Evolution vert "
 "starta på nytt."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: ../addressbook/addressbook.error.xml.h:37
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr "_Ikkje lagra"
+
+#: ../addressbook/addressbook.error.xml.h:41
+msgid "_Resize"
+msgstr "End_ra storleik"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr ""
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Standard synkroniseringsaddresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1241
-#: ../addressbook/conduit/address-conduit.c:1242
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
 msgid "Could not load addressbook"
 msgstr "Klarte ikkje å lasta adressebok"
 
-#: ../addressbook/conduit/address-conduit.c:1310
-#: ../addressbook/conduit/address-conduit.c:1313
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lesa addresseblokka i programmet til piloten"
 
@@ -576,9 +605,10 @@ msgstr "Set opp autofullføring her"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Kontaktar"
 
@@ -616,14 +646,14 @@ msgstr "Hald styr på S/MIME-sertifikata dine her"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573 ../calendar/gui/migration.c:1081
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
+#: ../mail/mail-vfolder.c:216
 msgid "On This Computer"
 msgstr "På denne datamaskina"
 
@@ -632,138 +662,136 @@ msgstr "På denne datamaskina"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581 ../calendar/gui/migration.c:1089
-#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:248
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
+#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "Personleg"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "På LDAP-tenarar"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Opprett ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Lag ei ny kontaktliste"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Lag ei ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-component.c:407
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "Kopier innhaldet lokalt for å arbeida fråkopla"
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy _book content locally for offline operation"
+msgstr "Kopier _bokinnhald lokalt for å arbeida fråkopla"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2051
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2353
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allmennt"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:569
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:387
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Tenarinformasjon"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljar"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:935
 msgid "Searching"
 msgstr "Søkjer"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Lastar ned"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Addressebokeigenskapar"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "Overfører ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Overfører «%s»:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP-tenarar"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Autofullføringsinnstillingar"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -775,7 +803,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -785,7 +813,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -795,7 +823,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -821,39 +849,32 @@ msgstr "Endra namn på mappa"
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenamn kan ikkje innehalda teiknet «/»."
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "Mappa finst frå før"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:954
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:985
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1126
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "Lagra som VCard ..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "Lagra som VCard ..."
-
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Eigenskapar ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "Kjeldeveljar for kontaktar"
 
@@ -862,30 +883,37 @@ msgstr "Kjeldeveljar for kontaktar"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:501
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:481
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Skriv passordet til %s (brukar %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:51
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "Skriv inn passord"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Autofullfør lengd"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList-XML til lista over fullføringsadresser (URI-ar)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList-XML til lista over fullføringsadresser (URI-ar)."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
@@ -893,11 +921,11 @@ msgstr ""
 "Plasseringa til det loddrette feltet, mellom kort- listeframsyningane og "
 "førehandsframsyninga, i biletepunkt."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "Vis førehandsframsyningsfeltet"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -905,20 +933,20 @@ msgstr ""
 "Talet på teikn som må vera skrivne for at Evolution skal prøva å "
 "autofullføra."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresse til mappa som vart sist brukt i «Vel namn»-dialogen"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Adresse til mappa som vart sist brukt i «Vel namn»-dialogen."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Plassering av loddrett felt"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Om førehandsframsyningsfeltet skal visast."
 
@@ -943,7 +971,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
@@ -1191,9 +1218,9 @@ msgid "_Login method:"
 msgstr "På_loggingsmetode:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:163
+#: ../calendar/gui/dialogs/calendar-setup.c:229
+#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Namn:"
@@ -1207,7 +1234,7 @@ msgid "_Search scope:"
 msgstr "Sø_keområde:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "Te_nar:"
@@ -1226,12 +1253,11 @@ msgstr "kort"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:395
 msgid "minutes"
 msgstr "minutt"
 
@@ -1272,98 +1298,99 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ka_tegoriar ..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Fullt _namn ..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Bilete"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "Kalle_namn:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr "_Kallenamn:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Personleg informasjon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
-msgstr "_Adresse: "
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "_Adresse:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "Ka_tegoriar ..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "Post_stad:"
@@ -1441,7 +1468,7 @@ msgid "_Web Log:"
 msgstr "_Vevlogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Lagrast kor:"
 
@@ -1450,26 +1477,25 @@ msgid "_Zip/Postal Code:"
 msgstr "Post_nummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresse"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1821 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3687
 msgid "Editable"
 msgstr "Kan redigerast"
 
@@ -2451,11 +2477,14 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../mail/em-mailer-prefs.c:481
+#: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../plugins/plugin-manager/plugin-manager.c:56
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "Namn"
 
@@ -2465,8 +2494,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2479,8 +2508,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2489,9 +2518,9 @@ msgid "Service"
 msgstr "Teneste"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
 msgstr "Stad"
 
@@ -2500,76 +2529,76 @@ msgid "Username"
 msgstr "Brukarnamn"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Heim"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Anna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "Kjeldebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "Målbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "Påkravde felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "Endra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid "Please select an image for this contact"
 msgstr "Vel eit bilete til denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid "_No image"
 msgstr "_Ikkje noko bilete"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2577,43 +2606,43 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tomt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
 msgid "Contact Quick-Add"
 msgstr "Ny kontakt - raskt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
 msgid "_Full name"
 msgstr "_Fullt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "_Select Address Book"
 msgstr "_Vel adressebok"
 
@@ -2667,10 +2696,6 @@ msgstr "_Land:"
 msgid "Full Address"
 msgstr "Full adresse"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "_Adresse:"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
@@ -2684,7 +2709,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -2756,72 +2781,56 @@ msgstr "_Lynmeldingsteneste:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Stad:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Legg til ei e-post-adresse i lista"
+msgid "<b>Members</b>"
+msgstr "<b>Medlemmer</b> "
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Endra kontaktar"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Set inn e-postadresser frå adressebok"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "Medlemmar"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Fjern ein e-postadresse frå lista"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "Vel ..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Gøym adresser når du sender e-post til denne lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "_Listenamn:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "_Vel"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv ei e-post-adresse eller dra ein kontakt til lista under:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "Kontaktlistemedlemmar"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Bok"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 msgid "_Members"
 msgstr "_Medlemmar"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "Kontaktlistemedlemmar"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Endra kontakt:"
@@ -2837,11 +2846,11 @@ msgstr "Duplikatkontakt funne"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
-"Den nye e-post-adressa eller det nye namnet til denne\n"
-"kontakten finst allereie i denne mappa. Vil du leggja han til likevel?"
+"Namnet eller e-post-adressa til denne kontakten finst alt i denne mappa. Vil "
+"du leggja han til likevel?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2859,143 +2868,157 @@ msgstr ""
 "Namnet eller e-post-adressa til denne kontakten finst\n"
 "alt i denne mappa. Vil du leggja han til likevel?"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+msgid "Merge Contact"
+msgstr "Slå ihop kontakt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+msgid "_Merge"
+msgstr "_Slå ihop"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:860
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "E-post"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:176
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "Ingen kontaktar"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontaktar"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "Spør"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Feil ved henting av bokframsyning"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3329
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3551
 msgid "Model"
 msgstr "Modell"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "Feil under endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Kjelde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:250
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:487
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:501
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:840
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
 msgstr "Lagra som VCard ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../calendar/gui/dialogs/comp-editor.c:1101
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Opna"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_New Contact..."
 msgstr "_Ny kontakt ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
-msgid "_Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as vCard..."
 msgstr "Lagra _som VCard ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contact"
 msgstr "_Vidaresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Forward Contacts"
 msgstr "_Vidaresend kontaktar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contact"
 msgstr "Send _melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to List"
 msgstr "Send _melding til liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Send _Message to Contacts"
 msgstr "Send _melding til kontaktar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cop_y to Address Book..."
 msgstr "Ko_pier til adressebok ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Mo_ve to Address Book..."
 msgstr "Fl_ytt til adressebok ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
-#: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3153 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:457
+#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3003,29 +3026,25 @@ msgstr "Klipp u_t"
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 msgid "P_aste"
 msgstr "_Lim inn"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:423
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
 msgid "Any Category"
 msgstr "Einkvar kategori"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
-msgid "Print cards"
-msgstr "Skriv ut kort"
-
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Other error"
 msgstr "Anna feil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -3055,6 +3074,7 @@ msgstr "Biltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
 #: ../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
@@ -3062,84 +3082,78 @@ msgid "Categories"
 msgstr "Kategoriar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Firmatelefon"
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "Selskap"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "E-post"
+msgid "Company Phone"
+msgstr "Firmatelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Etternamn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arkiver som"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Førenamn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Heimefaks"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Heimetelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Heimetelefon 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN-telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Journal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "Sjef"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "Kallenamn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "Merknad"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "Organisasjon"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alternativ faks"
@@ -3161,15 +3175,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:498
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Rolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -3202,32 +3215,32 @@ msgstr "Nettstad"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
 msgid "Width"
 msgstr "Breidd"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
-#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
 msgid "Height"
 msgstr "Høgd"
 
@@ -3329,216 +3342,217 @@ msgstr "Vald"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkje i nettlesar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2511
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2808
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkjeadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-msgid "_Send New Message To ..."
-msgstr "_Send ny melding til ..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+msgid "_Send New Message To..."
+msgstr "_Send melding til ..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
 msgid "List Members"
 msgstr "Listemedlemmar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "E-post"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "_Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2286
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Ledig/oppteken"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "Heimeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "Vevlogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2335
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2336
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
 msgid "Job Title"
 msgstr "Jobbtittel:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
 msgid "Home page"
 msgstr "Heimeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Blog"
 msgstr "Vevlogg"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Success"
 msgstr "Vellukka"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Backend busy"
 msgstr "Motoren er oppteken"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Repository offline"
 msgstr "Fråkopla lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Address Book does not exist"
 msgstr "Adresseboka finst ikkje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "No Self Contact defined"
 msgstr "Ingen sjølvkontakt 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:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Contact not found"
 msgstr "Fann ikkje kontakt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID finst frå før"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Avbroten"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Could not cancel"
 msgstr "Klarte ikkje avbryta"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Authentication Required"
 msgstr "Treng autentisering"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "TLS not Available"
 msgstr "TLS er ikkje tilgjengeleg"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "No such source"
 msgstr "Ikkje noko slik kjelde"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Not available in offline mode"
 msgstr "Ikkje tilgjengeleg i fråkopla modus"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Invalid server version"
 msgstr "Ugyldig versjon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3549,7 +3563,7 @@ msgstr ""
 "Last adresseboka ein gong i tilkopla modus for å sjå på innhaldet."
 
 # TRN. «Aksessera». Blæ.
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3558,7 +3572,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Sjå til at stien %s finst og at du har "
 "løyve til å henta han."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3566,7 +3580,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
 "ugyldig adresse, eller at LDAP-tenaren ikkje kan nåast."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3576,7 +3590,7 @@ msgstr ""
 "ynsjer å bruka LDAP i Evolution, må du installera ein variant med LDAP-"
 "støtte."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3584,7 +3598,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
 "ugyldig adresse, eller at tenaren ikkje kan nåast."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3596,7 +3610,7 @@ msgstr ""
 "til å visa. Gjer søket ditt meir spesifikt eller hev\n"
 "resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3608,45 +3622,45 @@ msgstr ""
 "auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
 "for denne adresseboka."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Motoren til denne adresseboka kunne ikkje tolka denne spørjinga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Motoren til denne adresseboka nekta å utføra denne spørjinga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
 msgstr "Spørjinga avslutta ikkje vellukka."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:705
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Feil når kontakt vart lagt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying contact"
 msgstr "Feil ved endring av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:658
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Feil ved fjerning av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3661,8 +3675,16 @@ msgstr[1] ""
 "Å opna %d kontaktar vil óg opna %d nye vindauge på skjermen.\n"
 "Vil du verkeleg visa alle desse kontaktane?"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
+msgid "_Don't Display"
+msgstr "Ikkje _vis"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
+msgid "Display _All Contacts"
+msgstr "Vis _alle kontaktane"
+
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3671,64 +3693,65 @@ msgstr ""
 "«%s» finst frå før.\n"
 "Vil du skriva over?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
 msgid "Overwrite"
 msgstr "Skriv over"
 
 #. 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:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontaktar"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
 msgid "Select Address Book"
 msgstr "Vel adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
 msgid "Copy contact to"
 msgstr "Kopiér kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Move contacts to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Copy contacts to"
 msgstr "Kopiér kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:999
-msgid "Multiple VCards"
-msgstr "Fleire VCard"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "Fleire vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1002
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
 #, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
+msgid "vCard for %s"
+msgstr "vCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1043
-#: ../addressbook/gui/widgets/eab-gui-util.c:1061
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#, c-format
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
@@ -3738,23 +3761,23 @@ msgid "Querying Address Book..."
 msgstr "Spør adresseboka ..."
 
 # TRN: Sentence splicing
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det er ein annan kontakt."
 msgstr[1] "Det er %d andre kontaktar."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "Vis fullt VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "Vis fullt vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Vis kompakt VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr "Vis kompakt vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
 msgstr "Lagra i addressebok"
 
@@ -3762,13 +3785,11 @@ msgstr "Lagra i addressebok"
 msgid "Card View"
 msgstr "Kort-framframsyning"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK-treframsyning"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
+#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importerer ..."
 
@@ -3798,43 +3819,22 @@ msgstr "Evolution CSV eller Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- og Tab-importør"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
-msgid "Importing ..."
-msgstr "Importerer ..."
-
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:667
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF-importør"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
 
 # TRN: Feilmeld nær-identiske strengar
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard-importør"
-
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Skriv ut konvolutt"
-
-#: ../addressbook/printing/e-contact-print.c:849
-msgid "Print contacts"
-msgstr "Skriv ut kontaktar"
-
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
-msgid "Print contact"
-msgstr "Skriv ut kontakt"
+msgid "Evolution vCard Importer"
+msgstr "Evolution vCard-importør"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3877,12 +3877,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:649
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1913
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:648
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Topptekst"
 
@@ -3935,7 +3935,6 @@ msgid "Options"
 msgstr "Val"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Retning"
 
@@ -3985,9 +3984,9 @@ msgstr "Skuggelegging"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:987
 #: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Storleik:"
 
@@ -4004,7 +4003,7 @@ msgid "Top:"
 msgstr "Topp:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "Type:"
 
@@ -4021,7 +4020,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "Test av kontakt-utskriftsstilredigering"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:44
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Opphavsrett © 2000, Ximian, Inc."
 
@@ -4029,16 +4028,16 @@ msgstr "Opphavsrett © 2000, Ximian, Inc."
 msgid "This should test the contact print style editor widget"
 msgstr "Dette skal testa utskriftsstilredigeringselementet for kontaktar"
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
 msgstr "Testutskrift av kontakt"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:46
 msgid "This should test the contact print code"
 msgstr "Dette skal testa koden som skriv ut kontaktar"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Kan ikkje opna fila"
@@ -4051,73 +4050,71 @@ msgstr "Klarte ikkje å henta lista over adressebøker"
 msgid "failed to open book"
 msgstr "klarte ikkje å opna boka"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "Spesifiser utfil som skal brukast i staden for standard ut."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "UTFIL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "List local addressbook folders"
 msgstr "List opp lokale adressebokmapper"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "Vis kort som vcard eller csv-fil"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
-msgstr "Talet på kort i ei utfil i asynkron modus, vanleg er 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr "Talet på kort i ei utfil i asynkron modus: Vanleg er 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "TAL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "Feil i kommandolinjeargumenta. Bruk --help for å sjå ein hjelpetekst."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "Støtt berre csv- eller cvard-format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "I asynkron modus må ut-kanalen vera ei fil."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "I vanleg modus trengst ikkje storleiksvalet."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "Ikkje handsama feil"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Feil ved lasting av standard addressebok."
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Inndata fil"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Filnamn ikkje oppgjeve."
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
+"a calendar that can accept appointments."
+msgstr ""
+"«{0}» ei skrivebeskytta kalendarkjelde. Byt til kalenderframsyninga og vel "
+"ein kalender som tek imot avtalar."
 
-#: ../calendar/calendar.error.xml.h:1
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4125,29 +4122,26 @@ msgstr ""
 "Eit meiningsfullt samandrag vil fortelja mottakarane kva avtalen din handlar "
 "om."
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 "Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
 
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+#: ../calendar/calendar.error.xml.h:5
+msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"All informasjonen i desse journaloppføringane vil verta sletta, og kan ikkje "
+"All informasjonen i desse notata vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:6
+msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
-"All informasjonen i denne journalen vil verta sletta, og kan ikkje "
+"All informasjonen i dette notatet vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4155,124 +4149,129 @@ msgstr ""
 "All informasjonen om desse avtalane vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om desse oppgåvene vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne avtalen vil verta sletta og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"All unformasjonen om denne journaloppføringa vil verta sletta og kan ikkje "
+"All informasjonen om dette møtet vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:11
+msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
-"All informasjonen om dette møtet vil verta sletta, og kan ikkje "
+"All informasjonen i dette notatet vil verta sletta, og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne oppgåva vil verta sletta og kan ikkje "
 "gjenopprettast."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Er du sikker på at du vil sletta oppgåva «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil sletta avtalen «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Er du sikker på at du vil sletta journaloppføringa «{0}»?"
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Er du sikker på at du vil sletta notatet «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil sletta desse {0} avtalane?"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Er du sikker på at du vil sletta desse {0} journaloppføringane?"
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Er du sikker på at du vil sletta desse {0} notata?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil sletta desse {0} oppgåvene?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil sletta denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Er du sikker på at du vil sletta denne journaloppføringa?"
-
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:183
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil sletta dette møtet?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Er du sikker på at du vil sletta dette notatet?"
+
+#: ../calendar/calendar.error.xml.h:22
 #: ../calendar/gui/dialogs/delete-comp.c:186
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil sletta denne oppgåva?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Er du sikker på at du vil senda notatet utan samandrag?"
+
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Er du sikker på at du vil senda avtalen utan samandrag?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Er du sikker på at du vil senda oppgåva utan samandrag?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:26
 msgid "Cannot create a new event"
 msgstr "Klarte ikkje å laga ei ny hending"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete calendar '{0}'?"
 msgstr "Sletta kalenderen «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:28
 msgid "Delete memo list '{0}'?"
 msgstr "Sletta oppgåvelista «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:29
 msgid "Delete task list '{0}'?"
 msgstr "Sletta oppgåvelista «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:30
 msgid "Do _not Send"
 msgstr "I_kkje send"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Lastar ned. Vil du lagra avtalen?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Lastar ned. Vil du lagra oppgåva?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Editor could not be loaded."
 msgstr "Redigeringsprogram kunne ikkje opnast."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4280,42 +4279,42 @@ msgstr ""
 "Invitasjonar vil verta sendte til alle deltakarane per e-post, og gje dei "
 "høve til å godta denne oppgåva."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-post-invitasjonar vil verta sendt til alle deltakarane, som óg vil verta "
 "bedne om å svara."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading calendar"
 msgstr "Feil under opning av kalenderen"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid "Error loading memo list"
 msgstr "Feil under opning av notatliste"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Error loading task list"
 msgstr "Feil under opning av oppgåveliste"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
+"the meeting is canceled."
 msgstr ""
 "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
-"deltakarane veit at journalen er sletta."
+"deltakarane veit at møtet er avlyst."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"the memo has been deleted."
 msgstr ""
 "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
-"deltakarane veit at møtet er avlyst."
+"deltakarane veit at notatet er sletta."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4323,7 +4322,7 @@ msgstr ""
 "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
 "deltakarane veit at oppgåva er sletta."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4331,7 +4330,7 @@ msgstr ""
 "Å senda oppdatert møteinformasjon gjer det mogleg for andre deltakarar å "
 "halda kalenderane sine oppdaterte."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4339,7 +4338,7 @@ msgstr ""
 "Å senda oppdatert informasjon til dei andre deltakarane let dei halda "
 "oppgåvelistene sine oppdaterte."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4347,7 +4346,7 @@ msgstr ""
 "Somme vedlegg vert lasta ned. Dersom du lagrar denne avtalen vil du mista "
 "desse vedlegga."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4355,83 +4354,83 @@ msgstr ""
 "Somme vedlegg vert lasta ned. Dersom du lagrar denne oppgåva vil du mista "
 "desse vedlegga."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Some features may not work properly with your current server."
 msgstr "Somme funksjonar vil kanskje ikkje virka med den noverande tenaren."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalenderen har avslutta uventa."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notatet har avslutta uventa."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution si oppgåvehandsaming har avslutta uventa."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikkje merka for fråkopla bruk"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The memo list is not marked for offline usage"
 msgstr "Oppgåvelista er ikkje merka for fråkopla bruk"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgåvelista er ikkje merka for fråkopla bruk"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil fjernast for godt."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlista vil fjernast for godt."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgåvelista vil fjernast for godt."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagra endringane i denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagra endringane i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagra endringane i denne oppgåva?"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "Vil du senda eit avlysingsvarsel for denne journaloppføringa?"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Vil du senda eit avlysingsvarsel for dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du senda melding om avlysing til alle deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du senda ein møteinvitasjon til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du senda denne oppgåva til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du senda oppdatert møteinformasjon til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du senda oppdatert oppgåveinformasjon til deltakarane?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4441,124 +4440,112 @@ msgstr ""
 "bruka Evolution. For å få gode resultat bør tenaren oppgraderast til ein "
 "støtta versjon."
 
-#: ../calendar/calendar.error.xml.h:63
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-"Du har vald ei skrivebeskytta kalendarkjelde. Byt til kalenderframsyninga og "
-"vel ein kalender som tek imot avtalar."
-
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endra denne avtalen, men ikkje lagra endringane."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endra denne oppgåva, men ikkje lagra endringane."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:68
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endra dette notatet, men ikkje lagra endringane."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderane dine vil ikkje vera tilgjengelege før Evolution vert starta på "
 "nytt."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Notata dine vil ikkje vera tilgjengelege før Evolution vert starta på nytt."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgåvene dine vil ikkje vera tilgjengelege før Evolution vert starta på "
 "nytt."
 
-#: ../calendar/calendar.error.xml.h:70
-#: ../composer/mail-composer.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:72
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Forkast endringane"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Lagra"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:74
 msgid "_Save Changes"
 msgstr "_Lagra endringane"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:76
 msgid "_Send Notice"
 msgstr "_Send varsel"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:77
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "Skriv inn passord"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendingar som går over fleire dagar:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1432
-#: ../calendar/conduits/calendar/calendar-conduit.c:1433
-#: ../calendar/conduits/memo/memo-conduit.c:854
-#: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:1038
-#: ../calendar/conduits/todo/todo-conduit.c:1039
+#: ../calendar/conduits/calendar/calendar-conduit.c:1517
+#: ../calendar/conduits/calendar/calendar-conduit.c:1518
+#: ../calendar/conduits/memo/memo-conduit.c:818
+#: ../calendar/conduits/memo/memo-conduit.c:819
+#: ../calendar/conduits/todo/todo-conduit.c:1016
+#: ../calendar/conduits/todo/todo-conduit.c:1017
 msgid "Could not start evolution-data-server"
 msgstr "Klarte ikkje å starta evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1529
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kan ikkje lesa kalenderprogramblokka på kalenderen"
 
-#: ../calendar/conduits/memo/memo-conduit.c:937
-#: ../calendar/conduits/memo/memo-conduit.c:940
+#: ../calendar/conduits/memo/memo-conduit.c:912
+#: ../calendar/conduits/memo/memo-conduit.c:915
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunne ikkje lesa notat-programblokka i piloten"
 
-#: ../calendar/conduits/memo/memo-conduit.c:976
-#: ../calendar/conduits/memo/memo-conduit.c:979
+#: ../calendar/conduits/memo/memo-conduit.c:959
+#: ../calendar/conduits/memo/memo-conduit.c:962
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunne ikkje skriva notat-programblokka i piloten"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
 msgstr "Standard prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1112
-#: ../calendar/conduits/todo/todo-conduit.c:1115
+#: ../calendar/conduits/todo/todo-conduit.c:1100
+#: ../calendar/conduits/todo/todo-conduit.c:1103
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikkje lesa oppgåveliste-programblokka i piloten"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
+#: ../calendar/conduits/todo/todo-conduit.c:1145
+#: ../calendar/conduits/todo/todo-conduit.c:1148
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikkje skriva oppgåveliste-programblokka i piloten"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgåver"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1392
 msgid "Calendars"
 msgstr "Kalendrar"
 
@@ -4599,22 +4586,25 @@ msgid "Memo_s"
 msgstr "Not_at"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
+#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
 msgid "Memos"
 msgstr "Notat"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1840
-#: ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
+#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:391
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:601
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Oppgåver"
@@ -4633,19 +4623,19 @@ msgstr "_Oppgåver"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution kalender alarmpåminningsteneste"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutt"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:396
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "time"
@@ -4662,10 +4652,10 @@ msgstr "Avtalar"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/e-itip-control.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Stad:"
 
@@ -4681,10 +4671,10 @@ msgstr "Tid alarmen skal utsetjast:"
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "R_edigér"
 
@@ -4696,17 +4686,17 @@ msgstr "Utse_tt"
 msgid "location of appointment"
 msgstr "stad for avtale"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 msgid "No summary available."
 msgstr "Inga skildring tilgjengeleg."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
 msgstr "Ingen informasjon om stad tilgjengeleg"
 
@@ -4715,12 +4705,13 @@ msgstr "Ingen informasjon om stad tilgjengeleg"
 msgid "You have %d alarms"
 msgstr "Du har %d alarmar"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1523
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4732,7 +4723,7 @@ msgstr ""
 "senda ein e-post. Evolution vil visa ein normal\n"
 "påminnar-dialogboks i staden."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4749,7 +4740,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køyra dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør om dette programmet fleire gongar."
 
@@ -4758,8 +4749,11 @@ msgid "Could not initialize Bonobo"
 msgstr "Klarte ikkje å starta Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "Kan ikkje laga factory for alarmtenesta"
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
+"Kan ikkje laga factory for alarmvarslingstenesta, kanskje han alt køyrer."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4794,157 +4788,161 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekund"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Alarm-program"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Be om stadfesting når oppføringar vert sletta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr ""
 "Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Bakgrunnsfarge på oppgåver som er over tida, i «#rrggbb»-format."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalender å køyra alarmar for"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge å teikna Marcus Bains-linja i tidslinja (tom for standard)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Farge å teikna Marcus Bains-linja i dagsframsyninga."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Komprimer helger i månadsframsyning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "Stadfest tøming"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dagar der byrjing og ende på arbeidsdagar skal visast."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "Vanleg avtalepåminnar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "Standard påminningseining"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "Einingar på standard påminning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "Grafient på hendingar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "Klårleik på hendingar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "Ledig/oppteken-tenar-adresser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "Ledig/oppteken-mal-adresse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "Gradient på hendingane i kalenderframsyningane."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Gøym fullførte oppgåver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Gøym oppgåveeingingar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Gøym oppgåveverdi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Plassering for vassrett felt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Time arbeidsdagen sluttar på, i 24-timarsformat, 0 til 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Time arbeidsdagen sluttar på, i 24-timarsformat, 0 til 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Kor store tidsrom som vert viste i dag- og arbeidsvekeframsyningane."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "Førre alarmtid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "Liste over tenaradresser til ledig/oppteken-offentleggjering."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains-linjefarge, dagsframsyning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains-linjefarge, tidslinje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minutt arbeidsdagen sluttar på, 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minutt arbeidsdagen startar på, 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "Plasseringa til det vassrette feltet i månadsframsyninga"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "Plasseringa til det loddrette feltet i månadsframsyninga"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "Tal på einingar i standard påminning."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "Tal på einingar som avgjer når oppgåver skal gøymast."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "Farge på oppgåver som har gått over tida"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4952,7 +4950,7 @@ msgstr ""
 "Plasseringa til det vassrette panelet, mellom datonavigeringskalenderen og "
 "oppgåvelista når ikkje i månadsframsyning, i pikslar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4960,7 +4958,7 @@ msgstr ""
 "Plasseringa til det vassrette panelet, mellom framsyninga og "
 "datonavigeringskalenderen og oppgåvelista i månadsframsyninga, i pikslar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -4968,7 +4966,7 @@ msgstr ""
 "Plasseringa til det loddrette feltet, mellom kalenderlistene og  "
 "datonavigasjonskalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4976,7 +4974,7 @@ msgstr ""
 "Plasseringa til det loddrette feltet, mellom oppgåvelista og "
 "førehandsframsyninga av oppgåver, i biletepunkt."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4984,7 +4982,7 @@ msgstr ""
 "Plasseringa til det loddrette panelet, mellom framsyninga og "
 "datonavigeringskalenderen og oppgåvelista i månadsframsyninga, i pikslar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -4993,65 +4991,69 @@ msgstr ""
 "datonavigeringskalenderen og oppgåvelista når ikkje i månadsframsyninga, i "
 "pikslar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Program som kan køyrast av alarmar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Vis be-om-svar-feltet i hending/oppgåve/møte-redigeringa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Vis rollefeltet i hending/oppgåve/møte-redigeringa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "Vis sluttidspunkt for avtalar i veke- og månadsframsyning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Vis kategorifeltet i hending/oppgåve/møte-redigeringa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "Vis varslingar i varslingstrau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Vis statusfeltet i hending/oppgåve/møte-redigeringa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Show the \"Preview\" pane"
 msgstr "Vis «Førehandsvis»-ramma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Show the \"Preview\" pane."
 msgstr "Vis «Førehandsvis»-ramma."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Vis tidssonefeltet i hending/oppgåve/møte-redigeringa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Vis typefeltet i hending/oppgåve/møte-redigeringa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "Vis vekenummer i datonavigatøren"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "Farge på oppgåver som vera ferdige i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "Plassering av vassrett oppgåvefelt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5060,7 +5062,7 @@ msgstr ""
 "Adressemalen å bruka som standardverdi for ledig/oppteken-data. «%u» vert "
 "erstatta av brukar-delen av e-post-adressa, og «%d» vert erstatta av domenet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5068,19 +5070,20 @@ msgstr ""
 "Standard tidssonar å bruka for datoar og tidspunkt i kalenderen, som ein "
 "ikkje omsett Olsen-tidssone-stad, t.d. «America/New York»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tida alarmen vart køyrt sist"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5088,46 +5091,46 @@ msgstr ""
 "Klårleik på hendingane i kalenderframsyningane, ein verdi mellom 0 (heilt "
 "klår) og 1 (heilt tett)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24-timars tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Einingar for standard påminnar, «minutt», «timar» eller «dagar»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einingar for å avgjera når oppgåver skal gøymast, «minutt», «timar» eller "
 "«dagar»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "Veka byrjar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Vekedag veka byrjar på, frå sundag (0) til laurdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Om varslingstrauet skal brukast til alarmar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Om det skal spørjast etter stadfesting når avtalar eller oppgåver vert "
 "sletta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Om det skal spørjast etter stadfesting når avtalar eller oppgåver vert "
 "sletta."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5135,118 +5138,146 @@ msgstr ""
 "Om helger skal komprimerast i månadsframsyninga, slik at laurdag og sundag "
 "vert viste i lag på like stor plass som ein arbeidsdag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Om sluttidspunkt for avtalar i veke- og månadsframsyning skal visast."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om utførte oppgåver skal gøymast frå oppgåveframsyninga."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "Om avtalar skal ha ei standardpåminning."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Om kategorifeltet skal visast i hending/oppgåve/møte-redigeringa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Om rollefeltet skal visast i hending/oppgåve/møte-redigeringa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal visast i hending/oppgåve/møte-redigeringa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timarsformat."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Om tidssonefeltet skal visast i hending/oppgåve/møte-redigeringa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Om typefeltet skal visast i hending/oppgåve/møte-redigeringa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om vekenummer skal visast i minikalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Om det skal justerast for sommartid når hendingar vert viste."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "Arbeidsdagar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "Time arbeidsdagen endar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "Minutt arbeidsdagen endar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "Timen arbeidsdagen byrjar på"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "Timen arbeidsdagen byrjar på"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "sommartid/vintertid"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Category is"
 msgstr "Kategori er"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Location contains"
 msgstr "Stad inneheld"
 
-#: ../calendar/gui/cal-search-bar.c:427
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 Days' Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:635
+msgid "Active Tasks"
+msgstr "Aktive oppgåver"
+
+#: ../calendar/gui/cal-search-bar.c:639
+msgid "Overdue Tasks"
+msgstr "Utgåtte oppgåver"
+
+#: ../calendar/gui/cal-search-bar.c:643
+msgid "Completed Tasks"
+msgstr "Ferdige oppgåver"
+
+#: ../calendar/gui/cal-search-bar.c:647
+msgid "Tasks with Attachments"
+msgstr "Oppgåver med vedlegg"
+
+#: ../calendar/gui/cal-search-bar.c:693
+msgid "Active Appointments"
+msgstr "Aktive avtalar"
+
+#: ../calendar/gui/cal-search-bar.c:697
+msgid "Next 7 Days' Appointments"
+msgstr "Avtalar dei neste sju dagane"
+
+#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 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 "
@@ -5256,15 +5287,15 @@ msgstr ""
 "tidslengda. Dersom du held fram, vil du ikkje kunna gjenoppretta desse "
 "hendingane."
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:397
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "dagar"
@@ -5273,89 +5304,103 @@ msgstr "dagar"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600 ../calendar/gui/migration.c:1108
-#: ../calendar/gui/tasks-component.c:217
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
+#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "På veven"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdagar og bryllupsdagar"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Vér"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:605
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2102
+msgid "_Copy..."
+msgstr "_Kopier ..."
+
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Eigenskapar"
+
+#: ../calendar/gui/calendar-component.c:939
 msgid "Failed upgrading calendars."
 msgstr "Klarte ikkje å oppgradera kalenderane."
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1238
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikkje opna kalenderen «%s» for å laga hendingar og møter"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1254
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender tilgjengeleg for å laga hendingar og møter"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1367
 msgid "Calendar Source Selector"
 msgstr "Kjelde for kalenderveljar"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1585
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1586
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1587
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1593
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1594
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1595
 msgid "Create a new meeting request"
 msgstr "Lag ein ny møteførespurnad"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1601
 msgid "New all day appointment"
 msgstr "Ny avtale for heile dagen"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1602
 msgid "All Day A_ppointment"
 msgstr "Avtale for heile _dagen"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1603
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale for heile dagen"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1609
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1610
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1611
 msgid "Create a new calendar"
 msgstr "Lag ein ny kalender"
 
@@ -5375,23 +5420,33 @@ msgstr "Vekesframsyning"
 msgid "Month View"
 msgstr "Månadsframsyning"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+msgid "Description Contains"
+msgstr "Skildringa inneheld"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Summary Contains"
+msgstr "Samandraget inneheld"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Feil under opning av kalenderen"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikkje støtta når kalenderen vert opna"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "Nekta tilgang til å opna kalenderen"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
 msgstr "Rediger alarm"
 
@@ -5439,67 +5494,71 @@ msgid "Run a program"
 msgstr "Køyr eit program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "Vel ei fil"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Send til:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Send ein e-post"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Argument:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "_Gjenta varselet"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Lyd:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "etter"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "før"
 
 #. 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/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "dag(ar)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "slutt på avtale"
 
 # TRN: Bør ha ulik tekst for minutt og for time.
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "gongar kvar(t)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutt"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "byrjing på avtale"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr "Handling/Utløysar"
 
@@ -5514,19 +5573,16 @@ msgstr "Le_gg til"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
 msgid "_Suggest automatic display of attachment"
 msgstr "_Foreslå automatisk framsyning av vedlegget"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
 msgid "Attach file(s)"
 msgstr "Legg ved filer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
 msgstr "Valde kalendrar for alarmar"
 
@@ -5551,7 +5607,7 @@ msgid ""
 msgstr "<i>%u og %d vil bytast ut med brukar og domene frå e-post-adressa.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varsel</span>"
 
@@ -5590,8 +5646,8 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Fredag"
 
@@ -5606,8 +5662,8 @@ msgstr ""
 "Dagar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "Måndag"
 
@@ -5630,8 +5686,7 @@ msgstr ""
 "Sundag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
@@ -5641,8 +5696,8 @@ msgid "S_un"
 msgstr "Su_n"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -5659,8 +5714,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigatøren"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -5678,8 +5733,8 @@ msgid "Template:"
 msgstr "Mal:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -5693,14 +5748,14 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "Tysdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -5778,81 +5833,46 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "K_opier kalenderinnhaldet lokalt for å arbeida fråkopla"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "K_opier oppgåvelisteinnhaldet lokalt for å arbeida fråkopla"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "K_opier notatlisteinnhaldet lokalt for å arbeida fråkopla"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Oppgåveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:478
 msgid "Calendar Properties"
 msgstr "Kalendereigenskapar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:480
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:536
 msgid "Task List Properties"
 msgstr "Oppgåvelisteeigenskapar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:592
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "Legg til kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "Legg til ny oppgåveliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "_Legg til kalender"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "_Legg til oppgåveliste"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "_Oppdater:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_Adresse:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "veker"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendinga er sletta."
@@ -5862,8 +5882,8 @@ msgid "This task has been deleted."
 msgstr "Denn oppgåva har vorte sletta."
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Denne journaloppføringa er sletta."
+msgid "This memo has been deleted."
+msgstr "Dette notatet er sletta."
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5886,8 +5906,8 @@ msgid "This task has been changed."
 msgstr "Oppgåva er endra."
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Journalopføringa er endra."
+msgid "This memo has been changed."
+msgstr "Dette notatet er endra."
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5900,165 +5920,156 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Ferdig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2889
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2894
-#: ../composer/e-msg-composer.c:3090
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3037
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldingar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3154
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3156
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1922
+#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
+#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
 msgid "Cancel _Drag"
 msgstr "Avbryt _dra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:663
+#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "vedlegg"
+
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948 ../composer/e-msg-composer.c:2502
+#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fil lagt ved"
 msgstr[1] "<b>%d</b> filer lagt ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1007
 msgid "Hide Attachment _Bar"
 msgstr "G_øym vedleggslinja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
-#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1010
+#: ../calendar/gui/dialogs/comp-editor.c:1558
 msgid "Show Attachment _Bar"
 msgstr "Vi_s vedleggslinja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3652
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3653 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
-msgid "_Properties"
-msgstr "_Eigenskapar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3655
+#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../composer/e-msg-composer.c:3633
 msgid "_Add attachment..."
 msgstr "_Legg ved ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1492
-#: ../mail/em-format-html-display.c:2267
+#: ../calendar/gui/dialogs/comp-editor.c:1582
+#: ../mail/em-format-html-display.c:2374
 msgid "Show Attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:1583
 msgid "Press space key to toggle attachment bar"
 msgstr "Trykk mellomrom for å slå av/på vedleggslinje."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2189
+#: ../calendar/gui/dialogs/comp-editor.c:2232
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2106
-#: ../calendar/gui/dialogs/comp-editor.c:2149
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2108
-#: ../calendar/gui/dialogs/comp-editor.c:2151
+#: ../calendar/gui/dialogs/comp-editor.c:2197
+#: ../calendar/gui/dialogs/comp-editor.c:2240
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2112
-#: ../calendar/gui/dialogs/comp-editor.c:2155
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgåve - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2117
-#: ../calendar/gui/dialogs/comp-editor.c:2160
+#: ../calendar/gui/dialogs/comp-editor.c:2206
+#: ../calendar/gui/dialogs/comp-editor.c:2249
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Journaloppføring - %s"
+msgid "Memo - %s"
+msgstr "Notat – %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2128
-#: ../calendar/gui/dialogs/comp-editor.c:2170
+#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2259
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2715
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:365
-msgid "attachment"
-msgstr "vedlegg"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2804
-#: ../calendar/gui/dialogs/comp-editor.c:2858
-#: ../calendar/gui/dialogs/comp-editor.c:2882
+#: ../calendar/gui/dialogs/comp-editor.c:2910
+#: ../calendar/gui/dialogs/comp-editor.c:2964
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringar som vert gjort i denne oppføringa kan verta forkasta dersom det "
 "kjem ei oppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2906
+#: ../calendar/gui/dialogs/comp-editor.c:3017
 msgid "Unable to use current version!"
 msgstr "Kan ikkje bruka noverande versjon!"
 
@@ -6088,8 +6099,8 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Noatet kunne ikkje slettast på grunn av ein CORBA-feil"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -6104,8 +6115,8 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgåva kan ikkje slettast fordi tilgang vert nekta"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Journaloppføringa kan ikkje slettast fordi tilgang vert nekta"
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Notatet kunne ikkje slettast fordi tilgang vart nekta"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6120,8 +6131,8 @@ msgid "The task could not be deleted due to an error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein feil"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Journaloppføringa kan ikkje slettast på grunn av ein feil"
+msgid "The memo could not be deleted due to an error"
+msgstr "Notatet kunne ikkje slettast på grunn av ein feil"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
@@ -6140,128 +6151,135 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:602
 msgid "Appoint_ment"
 msgstr "A_vtale"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:606
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
 msgstr "Denne hendinga har alarmar"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "_Delegatees"
 msgstr "_Utsendingar"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:946
 msgid "Atte_ndees"
 msgstr "_Deltakarar"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1128
 msgid "Event with no start date"
 msgstr "Hending utan startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1131
 msgid "Event with no end date"
 msgstr "Hending utan sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1313
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1336
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1454
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: ../calendar/gui/dialogs/event-page.c:1897
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
 msgid "_Add "
 msgstr "_Legg til:"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan ikkje opna kalenderen «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:3053
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dagar før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:3059
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timar før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:3065
 #, c-format
-msgid "%d minute before appointement"
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutt før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3078
 msgid "Customize"
 msgstr "Tilpass"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:3083
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2294
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:205
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1739
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "Ingen"
 
@@ -6281,17 +6299,11 @@ msgstr "15 minutt før avtalen"
 msgid "Attendee_s..."
 msgstr "_Deltakarar ..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Ka_tegoriar ..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Sjølvvald alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "S_kildring:"
 
@@ -6300,6 +6312,7 @@ msgid "Event Description"
 msgstr "Hendingsskildring"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Sa_mandrag:"
@@ -6326,56 +6339,6 @@ msgstr "i"
 msgid "until"
 msgstr "inntil"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Deltakar"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klikke her for å leggja til ein deltakar"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Felles namn"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegert frå"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegert til"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Språk"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Medlem"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:510
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:521
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Status"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>D_eltakarar</b>"
@@ -6397,18 +6360,19 @@ msgstr "Organisator"
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:952
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Klarte ikkje å opna notat i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Til"
 
@@ -6417,106 +6381,68 @@ msgstr "Til"
 msgid "Sta_rt date:"
 msgstr "Sta_rt-dato:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Su_mmary"
-msgstr "Sa_mandrag"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_Til:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.c:434
+msgid "_Description:"
+msgstr "_Skildring:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-msgid "_Memo Content:"
-msgstr "_Notatinnhald:"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>Brukarval for kalender</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "Legg til ny kalender"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "Kalendergrupppe"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "Kalenderadresse"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "Kalendernamn"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "   Alternativ for oppgåveliste</b>                <b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "Legg til ny oppgåveliste"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "Oppgåvelistegruppe"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "Oppgåvelistenamn"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du endrar ei hending som skjer fleire gongar. Kva vil du endra?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Du delegerer ei hending som skjer fleire gongar. Kva vil du delegere?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Du endrar eit repeterande notat. Kva vil du endra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Berre denne instansen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Denne og tidlegare instansar"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Denne og framtidige instansar"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Alle instansane"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
 msgid "Recurrence date is invalid"
 msgstr "Datoen dette skal skje igjen er ikkje gyldig"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
 msgid "on"
 msgstr "på"
 
@@ -6524,7 +6450,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "first"
 msgstr "fyrste"
 
@@ -6533,7 +6459,7 @@ msgstr "fyrste"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "second"
 msgstr "sekund"
 
@@ -6541,7 +6467,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "third"
 msgstr "tredje"
 
@@ -6549,7 +6475,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "fjerde"
 
@@ -6557,13 +6483,13 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "Other Date"
 msgstr "Annan dato"
 
@@ -6571,7 +6497,7 @@ msgstr "Annan dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "1st to 10th"
 msgstr "1. til 10."
 
@@ -6579,7 +6505,7 @@ msgstr "1. til 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
 msgid "11th to 20th"
 msgstr "11. til 20."
 
@@ -6587,26 +6513,45 @@ msgstr "11. til 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "21st to 31st"
 msgstr "21. til 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 msgid "day"
 msgstr "dag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
 msgstr "tilfelle"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2378
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
+msgid "Add exception"
+msgstr "Legg til unnatak"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
+msgid "Could not get a selection to delete."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6615,7 +6560,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Unntak</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Førehandsframsyning</b>"
 
@@ -6662,7 +6607,7 @@ msgstr "år"
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -6677,48 +6622,51 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "Ferdig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
 msgid "High"
 msgstr "Høg"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:750
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
+#: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Vanleg"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:230
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
 msgid "Not Started"
 msgstr "Ikkje starta"
 
@@ -6731,7 +6679,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:363
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -6748,20 +6696,25 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Nettsideaddresse:"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1322
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Detaljar om oppgåve"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "Organi_sator:"
+
+#: ../calendar/gui/dialogs/task-page.c:866
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1885
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ikkje i stand å opna oppgåver i «%s»."
@@ -6774,9 +6727,10 @@ msgstr "_Deltakarar ..."
 msgid "Categor_ies..."
 msgstr "Kategor_iar ..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "Or_ganisator:"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "De_scription:"
+msgstr "_Skildring:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
@@ -6786,49 +6740,6 @@ msgstr "Tidssone:"
 msgid "_Due date:"
 msgstr "Forfalls_dato:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>Ledig/oppteken-k_alenderar</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>Utgjevingsfrekvens</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Adresse til kalender</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "Ledig/oppteken-offentleggjeringsinnstillingar"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "_Dagleg"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "_Manuell"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "_Passord:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "_Hugs passordet"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "Br_ukarnamn:"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "K_var veke"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6905,72 +6816,72 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjend utløysartype"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2879
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å opna %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Skildring:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Samandrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Due Date:"
 msgstr "Forfallsdato:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1127
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-itip-control.c:1169
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
+#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
 msgid "Public"
 msgstr "Offentleg"
 
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-calendar-table.c:339
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
+#: ../calendar/gui/e-calendar-table.c:340
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -6979,29 +6890,29 @@ msgid "End Date"
 msgstr "Sluttdato"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "Start-dato"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Summary"
 msgstr "Samandrag"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "Busy"
 msgstr "Oppteke"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7011,204 +6922,199 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1330
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1764
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:968
 msgid "Recurring"
 msgstr "Repeterande"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:970
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2113
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
 msgid "Select folder to save selected attachments..."
 msgstr "Vel mappe å lagra utvalde vedlegg i..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilete_utan_namn.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "_Lagra som ..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
 msgid "Set as _Background"
 msgstr "Bruk til _bakgrunn"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:281
 msgid "_Save Selected"
 msgstr "_Lagra valde"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
 #, c-format
 msgid "Open in %s..."
 msgstr "Opna i %s ..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:382
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:384
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:386
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:387
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:388
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:390
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:392
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1349
+#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "New _Task"
 msgstr "Ny _oppgåve"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1123
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "S_kriv ut"
+#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr "S_kriv ut ..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1380
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1381
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1382
 msgid "_Mark as Incomplete"
 msgstr "_Merk som uferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1383
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merk valde oppgåver som uferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1388
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1625
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Trykk her for å leggja til ei oppgåve"
@@ -7218,7 +7124,7 @@ msgstr "Trykk her for å leggja til ei oppgåve"
 msgid "% Complete"
 msgstr "prosent ferdig"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -7231,7 +7137,7 @@ msgid "Due date"
 msgstr "Forfallsdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -7239,105 +7145,112 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Sortér oppgåver"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1352
 msgid "Moving items"
 msgstr "Flyttar meldingar"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1354
 msgid "Copying items"
 msgstr "Kopierer element"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "New _Meeting"
 msgstr "Nytt _møte"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Current View"
 msgstr "_Aktiv framsyning"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1678
 msgid "Select T_oday"
 msgstr "Vel _i dag"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1679
 msgid "_Select Date..."
 msgstr "_Vel dato ..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1685
+msgid "Pri_nt..."
+msgstr "S_kriv ut ..."
+
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_er til kalender ..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Mo_ve to Calendar..."
 msgstr "Flytt til _kalender ..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte ..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1698
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1706
 msgid "Make this Occurrence _Movable"
 msgstr "Gjer denne førekomsten _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2208
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2212
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2262
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7353,22 +7266,20 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:124
+#: ../calendar/gui/e-cell-date-edit-text.c:127
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Datoen må tastast inn på dette formatet:\n"
-"\n"
 "%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutt oppdeling"
@@ -7379,37 +7290,47 @@ msgstr "%02i minutt oppdeling"
 #. 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:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view-top-item.c:1359
+#: ../calendar/gui/e-day-view.c:2145
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1087
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
+#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
+#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
+#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:769
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Komplisert gjentaking.)"
 
-#: ../calendar/gui/e-itip-control.c:770
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Kvar dag"
 msgstr[1] "Kvar %d. dag"
 
-#: ../calendar/gui/e-itip-control.c:775
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7417,88 +7338,110 @@ msgstr[0] "Kvar veke"
 msgstr[1] "Kvar %d. veke"
 
 # TRN: sentence splicing
-#: ../calendar/gui/e-itip-control.c:777
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:799
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Kvar veke på "
 msgstr[1] "Kvar %d. veke på "
 
-#: ../calendar/gui/e-itip-control.c:785
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " og "
 
 # TRN: Sentence splicing
-#: ../calendar/gui/e-itip-control.c:792
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: ../calendar/gui/e-itip-control.c:805
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: ../calendar/gui/e-itip-control.c:812
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kvar månad"
 msgstr[1] "kvar %d. månad"
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:853
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Kvart år"
 msgstr[1] "Kvart %d. år"
 
-#: ../calendar/gui/e-itip-control.c:827
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:866
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " til saman %d gong"
 msgstr[1] " til saman %d gongar"
 
-#: ../calendar/gui/e-itip-control.c:836
+#. 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:876
 msgid ", ending on "
 msgstr ", sluttar på"
 
-#: ../calendar/gui/e-itip-control.c:857
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:898
 msgid "Starts"
 msgstr "Startar"
 
-#: ../calendar/gui/e-itip-control.c:870
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:912
 msgid "Ends"
 msgstr "Sluttar"
 
-#: ../calendar/gui/e-itip-control.c:904
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:946
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Due"
 msgstr "Frist"
 
-#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:1003
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
-#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "Ein ukjend person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1126
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7506,293 +7449,292 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1174
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
-#: ../plugins/itip-formatter/itip-formatter.c:1752
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:688
-#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
-#: ../plugins/itip-formatter/itip-formatter.c:1758
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-itip-control.c:1224
+#: ../calendar/gui/e-itip-control.c:1266
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Møtet er avlyst, men det var ikkje ført opp i kalenderane dine"
 
-#: ../calendar/gui/e-itip-control.c:1226
+#: ../calendar/gui/e-itip-control.c:1268
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgåva er avlyst, men ho var ikkje ført opp i oppgåvelistene dine"
 
-#: ../calendar/gui/e-itip-control.c:1305
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1306
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ber om at %s er til stades på eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1314
+#: ../calendar/gui/e-itip-control.c:1355
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> spør etter deg for å stille opp på eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1315
+#: ../calendar/gui/e-itip-control.c:1356
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b>%s</b> ynskjer å leggja til noko til eit eksisterande møte."
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr "<b>%s</b> ynskjer å vera med på eit eksisterande møte."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen."
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på ein førespurnad om eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1335
+#: ../calendar/gui/e-itip-control.c:1376
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1383
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> har avlyst eit møte."
 
-#: ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-itip-control.c:1384
 msgid "Meeting Cancelation"
 msgstr "Møteavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt ei uforståeleg melding."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: ../calendar/gui/e-itip-control.c:1381
+#: ../calendar/gui/e-itip-control.c:1422
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1423
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ber om at %s utfører ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ber om at du utfører ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> ynskjer å leggja til ei eksisterande oppgåve."
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr "<b>%s</b> ynskjer å vera med på ei eksisterande oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen."
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1452
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på ei  oppgåvetildeling."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1453
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> har avlyst ei oppgåve."
 
-#: ../calendar/gui/e-itip-control.c:1420
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Task Cancelation"
 msgstr "Oppgåveavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1496
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/oppteken-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1497
 msgid "Free/Busy Information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1501
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> spør etter ledig/oppteken-informasjonen din."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1502
 msgid "Free/Busy Request"
 msgstr "Ledig/oppteken-førespurnad"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Reply"
 msgstr "Ledig/oppteken svar"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: ../calendar/gui/e-itip-control.c:1546
+#: ../calendar/gui/e-itip-control.c:1588
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til å vera rett forma"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1647
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingar inneheld berre førespurnader som ikkje er støtta."
 
-#: ../calendar/gui/e-itip-control.c:1638
+#: ../calendar/gui/e-itip-control.c:1680
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1712
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: ../calendar/gui/e-itip-control.c:1904
+#: ../calendar/gui/e-itip-control.c:1957
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: ../calendar/gui/e-itip-control.c:1932
+#: ../calendar/gui/e-itip-control.c:1991
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: ../calendar/gui/e-itip-control.c:1942
+#: ../calendar/gui/e-itip-control.c:2008
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:2050
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../calendar/gui/e-itip-control.c:2057
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
-#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
-#: ../calendar/gui/e-itip-control.c:2130
+#: ../calendar/gui/e-itip-control.c:2233
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: ../calendar/gui/e-itip-control.c:2202
+#: ../calendar/gui/e-itip-control.c:2304
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2332
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2231
+#: ../calendar/gui/e-itip-control.c:2333
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: ../calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2334
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2363
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2391
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: ../calendar/gui/e-itip-control.c:2317
+#: ../calendar/gui/e-itip-control.c:2419
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:708
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7826,7 +7768,6 @@ msgid "Chair Persons"
 msgstr "Møteleiarar"
 
 #: ../calendar/gui/e-meeting-list-view.c:71
-#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "Deltakarar som må vera med"
 
@@ -7838,82 +7779,96 @@ msgstr "Valgfrie deltakere"
 msgid "Resources"
 msgstr "Ressursar"
 
+#: ../calendar/gui/e-meeting-list-view.c:154
+msgid "Attendees"
+msgstr "Deltakarar"
+
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Møteleiar"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Deltakar som må vera med"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Valfri deltakar"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
 msgid "Needs Action"
 msgstr "Krev handling"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr "Mellombels"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegert"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:471
+#: ../calendar/gui/e-meeting-list-view.c:484
 msgid "Attendee                          "
 msgstr "Deltakar                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 msgid "In Process"
 msgstr "Under prossering"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel.c:2137
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B, %Y"
 
@@ -7922,7 +7877,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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel.c:2168
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7932,84 +7887,108 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:430
 msgid "A_ttendees..."
 msgstr "_Deltakarar ..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "O_ptions"
 msgstr "_Val"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _only working hours"
 msgstr "Vis berre _arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _zoomed out"
 msgstr "Vis _forminska"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/oppteken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "_All people and resources"
 msgstr "_Alle personar og ressursar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:567
 msgid "All _people and one resource"
 msgstr "Alle _pesonar og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:576
 msgid "_Required people"
 msgstr "_Påkravde deltakarar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "Required people and _one resource"
 msgstr "Påkravde folk _og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:648
 msgid "_End time:"
 msgstr "_Slutt-tid:"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Deltakar"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klikke her for å leggja til ein deltakar"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Felles namn"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegert frå"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegert til"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Språk"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Medlem"
+
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "Slett _valde notat"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Trykk her for å leggja til eit notat"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "Notatsortering"
-
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2748
+#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
+#: ../calendar/gui/gnome-cal.c:2871
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8018,38 +7997,33 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:840
 msgid "Loading memos"
 msgstr "Lastar notat"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:921
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opnar notat på %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Skriv inn passordet for %s"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:976
 msgid "Loading tasks"
 msgstr "Lastar oppgåver"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:1066
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opnar oppgåver på %s"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1311
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1361
 msgid "Expunging"
 msgstr "Tømer"
 
@@ -8061,47 +8035,47 @@ msgstr "Vel ei tidssone"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:828
 msgid "Updating query"
 msgstr "Oppdaterar spørjing"
 
-#: ../calendar/gui/gnome-cal.c:2409
+#: ../calendar/gui/gnome-cal.c:2508
 msgid "_Custom View"
 msgstr "Tilpassa framsyning"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2509
 msgid "_Save Custom View"
 msgstr "_Lagra sjølvvalt framsyning"
 
-#: ../calendar/gui/gnome-cal.c:2415
+#: ../calendar/gui/gnome-cal.c:2514
 msgid "_Define Views..."
 msgstr "_Definer framsyningar ..."
 
-#: ../calendar/gui/gnome-cal.c:2579
+#: ../calendar/gui/gnome-cal.c:2695
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Lastar avtalar til %s"
 
-#: ../calendar/gui/gnome-cal.c:2598
+#: ../calendar/gui/gnome-cal.c:2714
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Lastar oppgåver til %s"
 
-#: ../calendar/gui/gnome-cal.c:2607
+#: ../calendar/gui/gnome-cal.c:2723
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Lastar notat frå %s"
 
-#: ../calendar/gui/gnome-cal.c:2713
+#: ../calendar/gui/gnome-cal.c:2830
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: ../calendar/gui/gnome-cal.c:3641
+#: ../calendar/gui/gnome-cal.c:3787
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -8161,133 +8135,132 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vel i dag"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
 msgid "An organizer must be set."
 msgstr "Det må vera ein organisator."
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:485
 msgid "At least one attendee is necessary"
 msgstr "Det må vera minst ein deltakar"
 
-#: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
 msgid "Event information"
 msgstr "Informasjon om hending"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Task information"
 msgstr "Informasjon om oppgåve"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
-msgid "Journal information"
-msgstr "Journalinformasjon"
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+msgid "Memo information"
+msgstr "Notatinformasjon"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:698
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:747
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:755
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:759
 msgid "Counter-proposal"
 msgstr "Motframlegg"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:831
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/oppteken-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:841
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:1009
 msgid "You must be an attendee of the event."
 msgstr "Du må delta på denne hendinga."
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notat"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
-#: ../mail/mail-component.c:563
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d vald"
 msgstr[1] ", %d valde"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Klarte ikkje å oppgradera notat."
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Klarte ikkje å opna notatlista «%s» for å laga hendingar og møter"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Ingen kalender tilgjengeleg for å laga notat"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Notatkildeveljar"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "Nytt notat"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1260
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "Lag eit nytt notat"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "Nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1268
 msgid "_Shared memo"
 msgstr "_Delt notat"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "Lag eit nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1276
 msgid "Memo li_st"
 msgstr "Notatl_iste"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "Lag ei ny notatliste"
 
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
 msgid "Print Memos"
 msgstr "Skriv ut notat"
 
@@ -8316,327 +8289,295 @@ msgstr ""
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771 ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Klarte ikkje overføra gamle innstillingar frå evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:810
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikkje overføra kalenderen «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:978
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ikkje i stand å overføra oppgåvene «%s»"
 
-#: ../calendar/gui/migration.c:1212
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
 msgid "Notes"
 msgstr "Merknader"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:517
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:577
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:578
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:655
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "Sun"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "Mån"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "Tys"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "Ons"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "Tor"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "Fre"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "Lau"
 
-#. Day
-#: ../calendar/gui/print.c:1936
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Valt dag (%a %d %b %Y)"
-
-#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
-msgid "%a %b %d"
-msgstr "%a %d. %b"
-
-#: ../calendar/gui/print.c:1962
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
-#: ../calendar/gui/print.c:1969
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/print.c:1973
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Valt veke (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:1981
-msgid "Selected month (%b %Y)"
-msgstr "Valt månad (%b %Y)"
-
-#. Year
-#: ../calendar/gui/print.c:1988
-msgid "Selected year (%Y)"
-msgstr "Valt år (%Y)"
-
-#: ../calendar/gui/print.c:2317
+#: ../calendar/gui/print.c:2444
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2319
+#: ../calendar/gui/print.c:2446
 msgid "Task"
 msgstr "Oppgåve"
 
-#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2468
 #, c-format
 msgid "Summary: %s"
 msgstr "Samandrag: %s"
 
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/print.c:2490
+msgid "Attendees: "
+msgstr "Deltakarar: "
+
+#: ../calendar/gui/print.c:2530
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2547
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2559
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: ../calendar/gui/print.c:2433
+#: ../calendar/gui/print.c:2571
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2447
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: ../calendar/gui/print.c:2458
+#: ../calendar/gui/print.c:2595
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
-#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
-msgid "Print Preview"
-msgstr "Førehandsframsyning av utskrift"
-
-#: ../calendar/gui/print.c:2636
-msgid "Print Item"
-msgstr "Skriv ut element"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2697
+msgid "Upcoming Appointments"
+msgstr "Komande avtalar"
 
-#: ../calendar/gui/tasks-component.c:441
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Ny oppgåveliste"
 
-#: ../calendar/gui/tasks-component.c:517
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgåve"
 msgstr[1] "%d oppgåver"
 
-#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Klarte ikkje oppgradera oppgåver."
 
-#: ../calendar/gui/tasks-component.c:877
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikkje opna oppgåvelista «%s» for å laga hendingar og møter"
 
-#: ../calendar/gui/tasks-component.c:890
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengeleg for å laga oppgåver"
 
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Oppgåvekildeveljar"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1321
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1323
 msgid "Create a new task"
 msgstr "Lag ei ny oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1329
 msgid "New assigned task"
 msgstr "Nytildelt oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1330
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1331
 msgid "Create a new assigned task"
 msgstr "Lag ei ny tildelt oppgåve"
 
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1337
 msgid "New task list"
 msgstr "Ny oppgåveliste"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1338
 msgid "Tas_k list"
 msgstr "Oppgåvel_iste"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1339
 msgid "Create a new task list"
 msgstr "Lag ei ny oppgåveliste"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:455
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8648,25 +8589,21 @@ msgstr ""
 "\n"
 "Vil du sletta desse oppgåvene?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
 msgstr "Skriv ut oppgåver"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "MTOTFLS"
-
 #: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
+#: ../plugins/itip-formatter/itip-formatter.c:1580
 msgid "Opening calendar"
 msgstr "Opnar kalender"
 
@@ -10228,157 +10165,87 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
-#, c-format
-msgid "%.0fK"
-msgstr "%.0f KiB"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
-#, c-format
-msgid "%.0fM"
-msgstr "%.0f MiB"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
-#, c-format
-msgid "%.0fG"
-msgstr "%.0f GiB"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1027
-msgid "Attachment Bar"
-msgstr "Vedleggslinje"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Kan ikkje leggja ved fila «%s»: %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Kan ikkje leggja ved fila «%s»: Ikkje ei vanleg fil"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "Vedleggseigenskapar"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-type:"
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "Klikk her for adresseboka"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-composer-post-header.c:117
 msgid "Posting destination"
 msgstr "Mål for posten"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-composer-post-header.c:118
 msgid "Choose folders to post the message to."
 msgstr "Vel mapper å posta meldinga i."
 
-#: ../composer/e-msg-composer-hdrs.c:603
-msgid "Click here for the address book"
-msgstr "Klikk her for adresseboka"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "Klikk her for å velja mapper å posta til"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:635
-msgid "_Reply-To:"
-msgstr "_Svar-til:"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "_Signatur:"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:326
 msgid "Fr_om:"
 msgstr "_Frå:"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:649
-msgid "S_ubject:"
-msgstr "_Emne:"
+#: ../composer/e-msg-composer-hdrs.c:332
+msgid "_Reply-To:"
+msgstr "_Svar-til:"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:335
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:337
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakarane til meldinga"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:340
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:342
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som vil få ein kopi av meldinga"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:346
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:348
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+"appearing in the recipient list of the message"
 msgstr ""
 "Skriv inn adressene som vil få ein kopi av meldinga utan å visast i lista "
-"over mottakarar."
+"over mottakarar"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-msg-composer-hdrs.c:679
-msgid "Click here to select folders to post to"
-msgstr "Klikk her for å velja mapper å posta til"
-
-#: ../composer/e-msg-composer-hdrs.c:684
-msgid "Post To:"
-msgstr "Post til:"
+#: ../composer/e-msg-composer-hdrs.c:356
+msgid "S_ubject:"
+msgstr "_Emne:"
 
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:77
 msgid "A_ttach"
 msgstr "Legg _ved"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:198
 msgid "Insert Attachment"
 msgstr "Sett inn vedlegg"
 
-#: ../composer/e-msg-composer.c:828
+#: ../composer/e-msg-composer.c:819
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikkje signera utgåande melding. Ingen signeringssertifikat til denne "
 "kontoen"
 
-#: ../composer/e-msg-composer.c:835
+#: ../composer/e-msg-composer.c:826
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10386,52 +10253,42 @@ msgstr ""
 "Kan ikkje kryptera utgåande melding. Det er ikkje valt noko "
 "krypteringssertifikat til denne kontoen"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2531
+#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
 msgid "Hide _Attachment Bar"
 msgstr "G_øym vedleggslinja"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2534
-#: ../composer/e-msg-composer.c:3898
+#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3878
 msgid "Show _Attachment Bar"
 msgstr "Vi_s vedleggslinja"
 
-#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
 msgid "Unknown reason"
 msgstr "Ukjend grunn"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1525
 msgid "Could not open file"
 msgstr "Klarte ikkje opna fil"
 
-#: ../composer/e-msg-composer.c:1410
+#: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
 msgstr "Klarte ikkje henta meldinga frå redigeringa"
 
-#: ../composer/e-msg-composer.c:1689
+#: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
 msgstr "Melding utan namn"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1724
+#: ../composer/e-msg-composer.c:1856
 msgid "Open File"
 msgstr "Opna fil"
 
-#: ../composer/e-msg-composer.c:2174 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Laga automatisk"
-
-#: ../composer/e-msg-composer.c:2277
-msgid "Si_gnature:"
-msgstr "_Signatur:"
-
-#: ../composer/e-msg-composer.c:2545 ../composer/e-msg-composer.c:3780
-#: ../composer/e-msg-composer.c:3783
+#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
+#: ../composer/e-msg-composer.c:3761
 msgid "Compose Message"
 msgstr "Skriv ei melding"
 
-#: ../composer/e-msg-composer.c:5007
+#: ../composer/e-msg-composer.c:5031
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10464,7 +10321,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Fordi «{0}», må du kanskje gjera andre brukarval for e-post."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Fordi «{1}»."
 
@@ -10523,10 +10380,20 @@ msgstr ""
 "meldinga og halda fram der du slapp."
 
 #: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Send options available only for Novell Groupwise and Microsoft Exchange "
+"accounts."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Send options not available."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Fila {0} er ikkje ei vanleg fil, og kan ikkje sendast i ei melding."
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:20
 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."
@@ -10534,7 +10401,7 @@ msgstr ""
 "For å leggja til innhaldet i denne katalogen må du anten leggja ved filene "
 "ei og ei eller laga eit arkiv av katalogen og leggja ved arkivet."
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -10545,51 +10412,49 @@ msgstr ""
 "\n"
 "Kontroller at du har rett versjonar av gtkhtml og libgtkhtml installert."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
 msgstr "Klarte ikkje aktivera adressveljarkontrollen."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
 msgstr "Uferdige meldingar funne"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Du kan ikkje leggja fila {0} ved denne meldinga."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må setja opp ein konto før du kan skriva e-post."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "_Ikkje gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
 msgid "_Recover"
 msgstr "_Gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Message"
 msgstr "_Lagra melding"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
 msgid "Groupware Suite"
 msgstr "Gruppevarepakke"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "Evolution personleg informasjonshandsamar og e-postkomponent"
+msgid "Manage your email, contacts and schedule"
+msgstr ""
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10599,125 +10464,6 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>No er statusen din «ikkje på kontoret».</b>\n"
-"\n"
-"Vil du endra statusen til «på kontoret»? "
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Ikkje på kontoret-melding:</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Meldinga under vil automatisk verta sendt til alle som sender e-post "
-"til deg\n"
-"medan du ikkje er på kontoret.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Er er på kontoret no"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Eg er ikkje på kontoret no"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "Nei, ikkje endra status"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Ikkje på kontoret-assistent"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Endra status"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Ta imot e-post</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Senda e-post</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>Denne sida let deg velja om du vil ha ei kvittering når ei melding du "
-"har sendt vert lesen,\n"
-"og oppgje kva Evolution skal gjera når nokon andre ber om kvittering på at "
-"du har lese deira meldingar.</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "Alltid send kvittering"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Spør meg om eg vil senda kvittering"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "Aldri send kvittering"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "Kvitteringar på lesne meldingar"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "Be om lesekvittering på alle meldingane eg sender"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "Bortsett frå viss meldinga er til e postliste og ikkje berre til meg"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"Kva skal Evolution gjera når du får ei melding som ber om lesekvittering?"
-
-#: ../e-util/e-dialog-utils.c:283
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ei fil med det namnet finst frå før.\n"
-"Vil du skriva over henne?"
-
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "Skriv over fil?"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Evolution feil"
@@ -10740,6 +10486,19 @@ msgstr "Evolution spørjing"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern feil, bedt om ukjend feil «%s»"
 
+#: ../e-util/e-print.c:138
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:145
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:151
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "Klarte ikkje å opna fila «{0}»."
@@ -10756,151 +10515,233 @@ msgstr "Vil du skriva over henne?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fila finst «{0}»."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "Skriv over fil?"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "Skriv _over"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "Trauets retning."
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "_Viktig"
 
-#: ../filter/filter-datespec.c:78
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Arbeid"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Personleg"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "_Hugseliste"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "_Seinare"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "Merkelapp_namn:"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Edit Label"
+msgstr "Rediger merkelapp"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Add Label"
+msgstr "Legg til merkelapp"
+
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "Merkelappnamnet kan ikkje vera tomt."
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr ""
+
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund sidan"
 msgstr[1] "%d sekund sidan"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt sidan"
 msgstr[1] "%d minutt sidan"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time sidan"
 msgstr[1] "%d timar sidan"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "om 1 time"
+msgstr[1] "om %d timar"
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag sidan"
 msgstr[1] "%d dagar sidan"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "om 1 dag"
+msgstr[1] "om %d dagar"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 veke sidan"
 msgstr[1] "%d veker sidan"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 månad sidan"
 msgstr[1] "%d månader sidan"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "om 1 månad"
+msgstr[1] "om %d månader"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år sidan"
 msgstr[1] "%d år sidan"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "om 1 år"
+msgstr[1] "om %d år"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velja ein dato>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "no"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d. %b %Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "Vel ei tid å samanlikna med"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Vel ei fil"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "Viktig"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Hugseliste"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:95
-msgid "Later"
-msgstr "Seinare"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "_Søkjenamn:"
+#: ../filter/filter-rule.c:800
+msgid "R_ule name:"
+msgstr "R_egelnamn:"
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "Finn element som høver med desse kriteria"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:862
+msgid "A_dd Filter Criteria"
+msgstr "L_egg til filterregel"
+
+#: ../filter/filter-rule.c:868
 msgid "If all criteria are met"
 msgstr "dersom alle krava er oppfylte"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:868
 msgid "If any criteria are met"
 msgstr "dersom nokon av krava er oppfylte"
 
-#: ../filter/filter-rule.c:868
-msgid "Find items:"
-msgstr "Finn element:"
+#: ../filter/filter-rule.c:870
+msgid "_Find items:"
+msgstr "_Finn element:"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:892
 msgid "All related"
 msgstr "Alle tilhøyrande"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:892
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:892
 msgid "Replies and parents"
 msgstr "Svar og foreldre"
 
-#: ../filter/filter-rule.c:889
+#: ../filter/filter-rule.c:892
 msgid "No reply or parent"
 msgstr "Ingen svar eller foreldre"
 
-#: ../filter/filter-rule.c:891
-msgid "Include threads"
-msgstr "Ta med trådar"
+#: ../filter/filter-rule.c:894
+msgid "I_nclude threads"
+msgstr "T_a med trådar"
 
-#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Innkomande"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Utgåande"
 
@@ -10924,7 +10765,7 @@ msgstr "Dato manglar."
 msgid "Missing file name."
 msgstr "Filnamn manglar."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "Manglar namn."
 
@@ -10992,35 +10833,45 @@ msgstr "eit tidspunkt relativt til no"
 msgid "ago"
 msgstr "sidan"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "månader"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "sekund"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "tid no"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "ei tid du oppgjev"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:398
+msgid "weeks"
+msgstr "veker"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "år"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -11065,22 +10916,21 @@ msgstr "Evolution oppsettkontroll for e-postredigering"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-postinnstillingskontroll"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:524
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:581
-#: ../mail/mail-component.c:582 ../mail/mail-component.c:723
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
+#: ../mail/mail-component.c:740
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:502
 msgid "Mail Accounts"
 msgstr "E-postkontoar"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Preferences"
 msgstr "E-postinnstillingar"
 
@@ -11107,117 +10957,115 @@ msgstr ""
 "Kryss av i boksen for å godta lisensen.\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Vel mappe"
 
+#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "Laga automatisk"
+
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Spør for kvar einaste melding"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "Mottak av e-post"
 
 # TRN: Kva betyr dette?
-#: ../mail/em-account-editor.c:2046
-msgid "Automatically check for _new mail every"
-msgstr "Sjå automatisk etter ny e-post kvart"
+#: ../mail/em-account-editor.c:2053
+msgid "Check for _new messages every"
+msgstr "Sjå automatisk etter _nye meldinga kvar(t)"
+
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "minu_tt"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
 msgid "Sending Email"
 msgstr "Sending av e-post"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Standard"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Tryggleik"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
 msgid "Receiving Options"
 msgstr "Mottaksval"
 
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
-msgid "Checking for New Mail"
-msgstr "Sjå etter ny e-post"
+#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+msgid "Checking for New Messages"
+msgstr "Ser etter nye meldingar"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "Skru av"
-
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "Skru på"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:436
 msgid "[Default]"
 msgstr "[Standard]"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
+#: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "På"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:495
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:497
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:1062
 msgid "Unnamed"
 msgstr "Namnlaus"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:953
 msgid "Language(s)"
 msgstr "Språk"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:996
 msgid "Add signature script"
 msgstr "Legg til signaturskript"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1016
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Vidaresendt melding --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1703
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
 #. 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:1712
+#: ../mail/em-composer-utils.c:1750
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11225,6 +11073,10 @@ msgstr ""
 "${AbbrevWeekdayName} den ${Day}.${Month}.${Year} klokka ${24Hour}:${Minute} "
 "(${TimeZone}) skreiv ${Sender}:"
 
+#: ../mail/em-composer-utils.c:1891
+msgid "-----Original Message-----"
+msgstr "-------- Opprinneleg melding --------"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "_Filterreglar"
@@ -11247,364 +11099,402 @@ msgid "Attachments"
 msgstr "Vedlegg"
 
 #: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Pip"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Ferdig"
+
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "inneheld"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Sletta"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "finst ikkje"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "returnerer ikkje"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "høyres ikkje ut som"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Finst ikkje"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Kladd"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "sluttar med"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Finst"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "finst"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "Viktig"
+
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "er lik"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "er etter"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "er før"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "er flagga"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "er større enn"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "er ikkje"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "er ikkje flagga"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "er ikkje sett"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "er sett"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Skrot"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Skrottest"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Merkelapp"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Pass med alle"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Meldingshovud"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "Meldinga er skrot"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "Meldinga er ikkje skrot"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Send i røyr til program"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Spel lyd"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
 msgid "Read"
 msgstr "Lesen"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Mottakarar"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "Treff på regulært uttrykk"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "Svart til"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "returnerer"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "Køyr program"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Poengsum"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Avsendar"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "Sett merkelapp"
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Sett status"
 
 # TRN: Det skal ikkje vera KiB?
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Storleik (KiB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "høyres ut som"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Avsendarkonto"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Spesifikk linje i hovud"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "byrjar med"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
+#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>Då</b>"
+#: ../mail/em-filter-rule.c:489
+msgid "Then"
+msgstr "Så etter"
+
+#: ../mail/em-filter-rule.c:517
+msgid "Add Ac_tion"
+msgstr "Legg til han_dling"
 
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "Lag _søkjemappe frå søk ..."
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "Alle meldingane"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "Ulesne melding"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "Ingen merkelapp"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "_Lesne meldingar"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "Nylege meldingar"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "Meldingane frå dei siste fem dagane"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "Meldingar med vedlegg"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "_Viktige meldingar"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "Meldingane er ikkje skrot"
 
-#: ../mail/em-folder-browser.c:1019
+#: ../mail/em-folder-browser.c:1123
 msgid "Account Search"
 msgstr "Søk i denne kontoen"
 
-#: ../mail/em-folder-browser.c:1049
+#: ../mail/em-folder-browser.c:1176
 msgid "All Account Search"
 msgstr "Søk i alle kontoane"
 
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Ulesen melding:"
+msgstr[1] "Ulesne meldingar:"
+
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Tal på meldingar:"
 msgstr[1] "Tal på meldingar:"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "Ulesen melding:"
-msgstr[1] "Ulesne meldingar:"
-
-#: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../mail/em-folder-properties.c:323
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Mappeeigenskapar"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velja mappe>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "Lag"
+#: ../mail/em-folder-selector.c:262
+msgid "C_reate"
+msgstr "L_ag"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
 msgid "Search Folders"
 msgstr "Søk i mapper"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "INGEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "Kladd"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
 msgid "Loading..."
 msgstr "Lastar ..."
 
@@ -11623,285 +11513,323 @@ msgstr "Lastar ..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:372
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:732
 msgid "Mail Folder Tree"
 msgstr "E-postmappetre"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:891
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flyttar mappa %s"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappa %s"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1824
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meldingar til mappa %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1826
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldingar til mappa %s"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikkje sleppa meldingar i topplageret"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_Vis"
 
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2095
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
-#: ../mail/em-folder-tree.c:2070
-msgid "_Copy..."
-msgstr "_Kopier ..."
-
-#: ../mail/em-folder-tree.c:2071
-msgid "_Move..."
-msgstr "_Flytt ..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2100
 msgid "_New Folder..."
 msgstr "_Ny mappe ..."
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2103
+msgid "_Move..."
+msgstr "_Flytt ..."
+
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Gje nytt namn ..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2111
+msgid "Re_fresh"
+msgstr "O_ppdater"
+
+#: ../mail/em-folder-tree.c:2112
+msgid "Fl_ush Outbox"
+msgstr "Tøm _utboks"
+
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tøm papirkorga"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
+#: ../mail/em-folder-view.c:1207
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagar mappa «%s»"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: ../mail/em-folder-utils.c:730
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1343
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "S_kriv ut"
+
+#: ../mail/em-folder-view.c:1347
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1348
 msgid "_Move to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1349
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1352
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Unread"
 msgstr "Merk som _ulesen"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as Un_important"
 msgstr "Marker som ikkje vi_ktig"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as _Junk"
 msgstr "Marker som _skrot"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Not Junk"
 msgstr "Marker som _ikkje skrot"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1358
 msgid "Mark for Follo_w Up..."
 msgstr "Marker for _oppfølging..."
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1360
 msgid "_Label"
 msgstr "_Merkelapp"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1364
+msgid "_New Label"
+msgstr "_Ny merkelapp"
+
+#: ../mail/em-folder-view.c:1368
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1369
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1372
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: ../mail/em-folder-view.c:1151
-msgid "Search Folder from _Subject"
-msgstr "Søkjemappe på _emne"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1374
+msgid "Search Folder based on _Subject"
+msgstr "Søkjemappe etter _emne"
 
-#: ../mail/em-folder-view.c:1152
-msgid "Search Folder from Se_nder"
-msgstr "Søkjemapppe frå av_sendar"
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on Se_nder"
+msgstr "Søkjemappe etter av_sendar"
 
-#: ../mail/em-folder-view.c:1153
-msgid "Search Folder from _Recipients"
-msgstr "Søkjemappe på _mottakar"
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on _Recipients"
+msgstr "Søkjemappe etter _mottakar"
 
-#: ../mail/em-folder-view.c:1154
-msgid "Search Folder from Mailing _List"
-msgstr "Søkjemappe på på e-post_liste"
+#: ../mail/em-folder-view.c:1377
+msgid "Search Folder based on Mailing _List"
+msgstr "Søkjemappe etter e-post_liste"
 
-#: ../mail/em-folder-view.c:1158
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1382
+msgid "Filter based on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: ../mail/em-folder-view.c:1159
-msgid "Filter on Sen_der"
-msgstr "Filtrér på avsen_dar:"
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Sen_der"
+msgstr "Filtrér på avsen_dar"
 
-#: ../mail/em-folder-view.c:1160
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: ../mail/em-folder-view.c:1161
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1385
+msgid "Filter based on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2012 ../mail/em-folder-view.c:2056
+#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
 msgid "Default"
 msgstr "Forvald"
 
-#: ../mail/em-folder-view.c:2155
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "Skriv ut melding"
-
-#: ../mail/em-folder-view.c:2315
+#: ../mail/em-folder-view.c:2529
 msgid "Unable to retrieve message"
 msgstr "Kunne ikkje henta melding"
 
-#: ../mail/em-folder-view.c:2513
+#: ../mail/em-folder-view.c:2548
+msgid "Retrieving Message..."
+msgstr "Hentar melding ..."
+
+#: ../mail/em-folder-view.c:2807
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2810
 msgid "Create _Search Folder"
 msgstr "Lag ny _søkjemappe"
 
-#: ../mail/em-folder-view.c:2514
+#: ../mail/em-folder-view.c:2811
 msgid "_From this Address"
 msgstr "_Frå denne adressa"
 
-#: ../mail/em-folder-view.c:2515
+#: ../mail/em-folder-view.c:2812
 msgid "_To this Address"
 msgstr "_Til denne adressa"
 
-#: ../mail/em-folder-view.c:2872
+#: ../mail/em-folder-view.c:3309
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å senda e-post til %s"
 
-#: ../mail/em-folder-view.c:2877
+#: ../mail/em-folder-view.c:3321
+#, c-format
+msgid "Click to call %s"
+msgstr "Klikk for å senda ringa til %s"
+
+#: ../mail/em-folder-view.c:3326
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å gøyma/visa adresser"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:515
 #, c-format
 msgid "Matches: %d"
 msgstr "Stemmer med: %d"
 
-#: ../mail/em-format-html-display.c:647
-msgid "Fi_nd:"
+#: ../mail/em-format-html-display.c:659
+msgid "Fin_d:"
 msgstr "Fi_nn:"
 
-#: ../mail/em-format-html-display.c:675
-msgid "Fo_rward"
-msgstr "_Vidaresend"
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:683
+msgid "_Previous"
+msgstr "_Førre"
+
+#: ../mail/em-format-html-display.c:688
+msgid "_Next"
+msgstr "_Neste"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:693
 msgid "M_atch case"
 msgstr "_Skil mellom store og små bokstavar"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
 msgid "Unsigned"
 msgstr "Ikkje signert"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:992
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11909,11 +11837,11 @@ msgstr ""
 "Denne meldinga er ikkje signert. Det er ikkje mogleg å vita om meldinga er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:993
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11921,11 +11849,11 @@ msgstr ""
 "Denne meldinga er signert og gyldig. Det er svært sannsynleg at meldinga er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:929 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:994
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11933,11 +11861,11 @@ msgstr ""
 "Signaturen på denne meldinga kan ikkje stadfestast. Det er mogleg at ho har "
 "vorte tukla med undervegs."
 
-#: ../mail/em-format-html-display.c:930
-msgid "Valid signature, cannot verify sender"
-msgstr "Gyldig signatur, kan ikkje stadfesta avsendar"
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+msgid "Valid signature, but cannot verify sender"
+msgstr "Gyldig signatur, men kan ikkje stadfesta avsendar"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:995
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11945,11 +11873,23 @@ msgstr ""
 "Denne meldinga er signert med ein gyldig signatur, men avsendaren kan ikkje "
 "stadfestast."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:996
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"Denne meldinga er signert med ein signatur, men det er ikkje nokon "
+"tilsvarande offentleg nøkkel."
+
+#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:1003
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11957,11 +11897,11 @@ msgstr ""
 "Denne meldinga er ikkje kryptert. Innhaldet vil vera synleg når ho vert "
 "sendt over internett."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:1004
 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 "
@@ -11971,11 +11911,11 @@ msgstr ""
 "vanskeleg, men ikkje umogleg, for ein uvedkommande å bryta krypteringa og "
 "lesa meldinga på relativt kort tid."
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:1005
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11983,11 +11923,11 @@ msgstr ""
 "Denne meldinga er kryptert. Det er svært vanskeleg for ein uvedkommande å "
 "bryta krypteringa og lesa meldinga."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterkt"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:1006
 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 "
@@ -11997,217 +11937,320 @@ msgstr ""
 "vanskeleg for ein uvedkommande å bryta krypteringa og lesa meldinga på "
 "relativt kort tid."
 
-#: ../mail/em-format-html-display.c:1040 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1122
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet er ikkje mogleg å visa"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1441
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fullført %d. %B %Y klokka %H.%M"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1449
 msgid "Overdue:"
 msgstr "Over tida:"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1452
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "innan %d. %B %Y klokka %H.%M"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1512
 msgid "_View Inline"
 msgstr "_Vis innvevd"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1513
 msgid "_Hide"
 msgstr "_Gøym"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1514
 msgid "_Fit to Width"
 msgstr "_Tilpass til breidd"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1515
 msgid "Show _Original Size"
 msgstr "Bruk _opprinneleg storleik"
 
-#: ../mail/em-format-html-display.c:1867 ../mail/mail-config.glade.h:44
-#: ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../mail/em-format-html-display.c:2074
-msgid "Select folder to save all attachments..."
-msgstr "Vel mappe å lagra alle vedlegga i..."
+#: ../mail/em-format-html-display.c:2173
+msgid "Save attachment as"
+msgstr "Lagra vedlegg som"
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2177
+msgid "Select folder to save all attachments"
+msgstr "Vel mappe å lagra alle vedlegga i"
+
+#: ../mail/em-format-html-display.c:2228
 msgid "_Save Selected..."
 msgstr "_Lagra valde ..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2295
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d _vedlegg"
 msgstr[1] "%d _vedlegg"
 
-#: ../mail/em-format-html-display.c:2195 ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
 msgid "S_ave"
 msgstr "L_agra"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2313
 msgid "S_ave All"
 msgstr "Lagra _alle"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2376
 msgid "No Attachment"
 msgstr "Inga vedlegg"
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+msgid "View _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2509
+msgid "Hide _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2564
+msgid "O_pen With"
+msgstr "O_pna med"
+
+#: ../mail/em-format-html-display.c:2635
+msgid ""
+"Evolution cannot render this email as it is too large to handle. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Hentar «%s»"
 
-#: ../mail/em-format-html.c:621
-msgid "Valid signature but cannot verify sender"
-msgstr "Gyldig signatur, men kan ikkje stadfesta avsendar"
+#: ../mail/em-format-html.c:916
+msgid "Unknown external-body part."
+msgstr "Ukjend eksterndel."
 
-#: ../mail/em-format-html.c:892
+#: ../mail/em-format-html.c:924
 msgid "Malformed external-body part."
 msgstr "Misdanna eksterndel."
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:954
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peikar til FTP-nettstad (%s)"
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:965
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peikar til lokal fil (%s) gyldig på nettstaden (%s)"
 
-#: ../mail/em-format-html.c:935
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peikar til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:988
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peikar til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:999
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peikar til ukjende eksterne data (type «%s»)"
 
-#: ../mail/em-format-html.c:1194
+#: ../mail/em-format-html.c:1227
 msgid "Formatting message"
 msgstr "Formaterer melding"
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "Frå"
-
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
-msgid "Reply-To"
-msgstr "Svar-til"
+#: ../mail/em-format-html.c:1394
+msgid "Formatting Message..."
+msgstr "Formaterer melding ..."
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "Bcc:"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1025
+#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
+#: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1691
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I>(%a %H.%M %Z)</I>"
+#: ../mail/em-format-html.c:1733
+msgid " (%a, %R %Z)"
+msgstr "(%a %H.%M %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1694
-msgid "<I> (%R %Z)</I>"
-msgstr "<I>(%H.%M %Z)</I>"
-
-#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../mail/em-format-html.c:1738
+msgid " (%R %Z)"
+msgstr "(%H.%M %Z)"
+
+#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "Dato"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "Diskusjonsgrupper"
 
-#: ../mail/em-format.c:1102
+#. 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:1866
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
+msgid "From"
+msgstr "Frå"
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:91
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1196
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikkje tolka S/MIME-meldinga: Ukjend feil"
 
-#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "Klarte ikkje tolka MIME-melding. Viser som kjelde."
+msgstr "Klarte ikkje tolka MIME-meldinge. Viser som råtekst."
 
-#: ../mail/em-format.c:1279
+#: ../mail/em-format.c:1341
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstypen er ikkje støtta i multipart/encrypted"
 
-#: ../mail/em-format.c:1446
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message"
+msgstr "Klarte ikkje tolka PGP/MIME-meldinga"
+
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Klarte ikkje tolka PGP/MIME-meldinga: Ukjend feil"
+
+#: ../mail/em-format.c:1508
 msgid "Unsupported signature format"
 msgstr "Ikkje støtta signaturformat"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
 msgid "Error verifying signature"
 msgstr "Feil under stadfesting av signatur"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
 msgid "Unknown error verifying signature"
 msgstr "Ukjend feil under stadfesting av signatur"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message"
+msgstr "Klarte ikkje tolka PGP-meldinga"
+
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Kunne ikkje tolka PGP-meldinga: Ukjend feil"
+
+#: ../mail/em-mailer-prefs.c:108
 msgid "Every time"
 msgstr "Kvar gong"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per day"
 msgstr "Ein gong om dagen"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per week"
 msgstr "Ein gong i veka"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:111
 msgid "Once per month"
 msgstr "Ein gong i månaden"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "Farge"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:1115
+msgid "No Junk plugin available"
+msgstr ""
+
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "Hugseliste"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "Seinare"
+
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12219,49 +12262,49 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Klarte ikkje laga mappa «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Klarte ikkje kopiera mappa «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Klarte ikkje å leita etter eksisterande postboksar på «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Klarte ikkje å opna gamle data lagra på POP-tenaren «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikkje å laga katalog til å ha data liggjande i på POP-katalogen «%s»: "
 "%s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Klarte ikkje kopiera data lagra på POP3-tenar (%s): %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikkje å laga lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2827
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Klarte ikkje å laga lokale e-postmapper på «%s»: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2846
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12269,66 +12312,62 @@ msgstr ""
 "Klarte ikkje å lesa innstillingane til tidlegare installasjon av Evolution. "
 "«evolution/config.xmldb» finst ikkje eller er uleseleg."
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: ../mail/em-popup.c:621
-msgid "_Send New Message To..."
-msgstr "_Send melding til ..."
-
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:639
 msgid "_Add to Address Book"
 msgstr "Legg til _adressebok"
 
-#: ../mail/em-subscribe-editor.c:582
+#: ../mail/em-subscribe-editor.c:595
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Dette lageret støttar ikkje abonnement, eller dei er slått av."
 
-#: ../mail/em-subscribe-editor.c:612
+#: ../mail/em-subscribe-editor.c:628
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:632
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:814
+#: ../mail/em-subscribe-editor.c:834
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:855
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: ../mail/em-utils.c:141
-msgid "Do not show this message again."
-msgstr "Ikkje vis denne meldinga att."
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "Ikkje vis _denne meldinga att."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Meldingsfilter"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "melding"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "Lagra melding ..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:694
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1178
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldingar frå %s"
@@ -12337,117 +12376,196 @@ msgstr "Meldingar frå %s"
 msgid "Search _Folders"
 msgstr "Søkjemapper"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Søkjemappekjelde"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
-msgid "Automatic link recognition"
-msgstr "Kjenn att lenkjer automatisk"
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Allows evolution to display text part of limited size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Always request read receipt"
+msgstr "Alltid be om lesekvittering"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
-msgid "Automatic smiley recognition"
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
 msgstr "Kjenn att smilefjes automatisk"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "Kjenn att lenkjer automatisk"
+
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Check incoming mail being junk"
 msgstr "Kontroller om ny e-post er skrot"
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Citation highlight color"
 msgstr "Farge å merka sitering med"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Citation highlight color."
 msgstr "Farge å merka sitering med."
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Composer Window default height"
 msgstr "Standardhøgde på redigeringssvindauget"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Composer Window default width"
 msgstr "Standardbreidde på redigeringssvindauget"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "Komprimer adresser i Til/Cc/Bcc til talet oppgjeve i address_count."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to compose messages"
 msgstr "Standardteiknsett å bruka til å skriva meldingar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default charset in which to compose messages."
 msgstr "Standardteiknsett å bruka til å skriva meldingar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default charset in which to display messages"
 msgstr "Standardteiknsett å bruka til å visa meldingar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default charset in which to display messages."
 msgstr "Standardteiknsett å bruka til å visa meldingar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default forward style"
 msgstr "Standard vidaresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
-msgid "Default height of the Composer Window"
-msgstr "Standardhøgde på redigeringsvindauget"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default height of the Composer Window."
+msgstr "Standardhøgde på redigeringsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Message Window"
-msgstr "Standardhøgde på meldingsvindauget"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default height of the message window."
+msgstr "Standardhøgde på meldingsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Subscribe dialog"
-msgstr "Standardhøgde på abonneringsdialogen"
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default height of the subscribe dialog."
+msgstr "Standardhøgde på abonneringsdialogen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default reply style"
 msgstr "Standard svarstil"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
-msgid "Default width of the Composer Window"
-msgstr "Standardbreidde på redigeringsvindauget"
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default value for thread expand state"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Message Window"
-msgstr "Standardbreidde på meldingsvindauget"
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default width of the Composer Window."
+msgstr "Standardbreidde på redigeringsvindauget."
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Subscribe dialog"
-msgstr "Standardbreidde på abonneringsdialogen"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "Standardbreidde på meldingsvindauget."
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "Standardbreidde på abonneringsdialogen."
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Directory for saving mail component files."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marker skrivefeil etterkvart som du skriv."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:35
+#, fuzzy
+msgid "Empty Junk folders on exit"
+msgstr "Tøm papirkorga ved slutt"
+
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkorga ved slutt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:37
+#, fuzzy
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Tøm alle papirkorgene når Evolution avsluttar."
+
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkorgene når Evolution avsluttar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Bruk markørmodus, slik at du ser ein markør når du les e-post."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Enable or disable magic space bar"
+msgstr "Slå av eller på magisk mellomrom"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Enable or disable type ahead search feature"
 msgstr "Slå av eller på sanntidssøk"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders"
+msgstr "Bruk søkemapper"
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12458,19 +12576,33 @@ msgstr ""
 "skriva inn tekst. Dette gjer det lett å finna ei mappe frå sidestolpen ved å "
 "skriva namnet på mappa. Mappeframsyninga vil då gå til den mappa automatisk."
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Enable to render message text part of limited size."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable/disable caret mode"
 msgstr "Slå av/på markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Height of the message-list pane"
 msgstr "Høgda på meldingslisteramma"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Height of the message-list pane."
 msgstr "Høgda på meldingslisteramma."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12478,14 +12610,14 @@ msgstr ""
 "Dersom brukaren prøver å opna 10 eller fleire meldingar, spør om han/ho "
 "verkeleg vil gjera det."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr ""
 "Dersom «førehandsvis»-feltet er på, vis side-ved-side i staden for loddrett."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:53
 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 "
@@ -12496,27 +12628,49 @@ msgstr ""
 "Bonobo-komponent-framsynar i GNOME sin MIME-type-database brukast til å visa "
 "innhaldet."
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Slår av/på varsling under merking av fleire meldingar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:57
+#, fuzzy
+msgid "Last time empty junk was run"
+msgstr "Sist gong papirkorga vart tømt"
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Last time empty trash was run"
 msgstr "Sist gong papirkorga vart tømt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "List of Labels and their associated colors"
 msgstr "Liste over merkelappar og fargane deira"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "List of accepted licenses"
 msgstr "Liste over godtekne lisensar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "List of accounts"
 msgstr "Liste over kontoar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12524,11 +12678,11 @@ msgstr ""
 "Liste over kontoar som e-post-delen av Evolution veit om. Lista inneheld "
 "strengar som oppgjev underkatalogar til /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over sjølvvalde meldingshovudlinjer og om dei er i bruk."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12536,226 +12690,292 @@ msgstr ""
 "Liste over merkelappar e-post-delen av Evolution veit om. Lista inneheld "
 "strengar som inneheld «name:color» der fargen brukar HTML hex-koding."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnamn der lisensen er godteken."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Load images for HTML messages over http"
 msgstr "Last ned bilete til HTML-meldingar over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
 msgstr ""
 "Last ned bilete til HTML-meldingar over http(s). Moglege verdiar er: 0 - "
 "Aldri last ned bilete over nettet, 1 - Last ned bileta viss sendaren er i "
-"adresseboka, 2 - Alltid last ned bilete over nettet"
+"adresseboka, 2 - Alltid last ned bilete over nettet."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlingar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Log filter actions to the specified log file."
 msgstr "Loggfør filterhandlingar til den oppgjevne loggfila."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Logfile to log filter actions"
 msgstr "Loggfør filterhandlingar til denne fila"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Logfile to log filter actions."
 msgstr "Loggfør filterhandlingar til denne fila."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Mark as Seen after specified timeout"
 msgstr "Marker som lesen etter ei gitt tid"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som lesen etter ei gitt tid."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitering i førehandframsyningsramma"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitering i førehandframsyningsramma."
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Message Window default height"
 msgstr "Standardhøgde på meldingsvindauget"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Message Window default width"
 msgstr "Standardbreidde på meldingsvindauget"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Korleis meldingar vert viste («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+"Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
+
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
-msgid "Minimum time between emptying the trash on exit, in days."
+#: ../mail/evolution-mail.schemas.in.h:83
+#, fuzzy
+msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
-msgid "New Mail Notify sound file"
-msgstr "Lyd å spela ved ny e-post"
-
-#: ../mail/evolution-mail.schemas.in.in.h:60
-msgid "New Mail Notify type"
-msgstr "Type varsling om ny e-post"
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+"Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Tal på adresser å visa i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Prompt on empty subject"
 msgstr "Sei ifrå når emnefeltet er tomt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Sei ifrå når brukaren tømmer ei av mappe."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Spør brukaren når han prøver å senda ei melding utan emne."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Prompt when user expunges"
 msgstr "Spør når brukaren fjernar sletta meldingar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Prompt when user only fills Bcc"
 msgstr "Spør når brukaren berre sender til Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Spør når brukaren prøver å opne ti eller fleire meldingar på ein gong"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når brukaren sender ei melding som ikkje har mottakarar i To:- eller "
 "Cc:-felta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når brukaren prøver å senda uynskt HTML-e-post"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt while marking multiple messages"
 msgstr "Spør når brukaren merkar fleire meldingar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Kjenn att smilefjes i teksten, og byt dei ut med bilete."
+
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Recognize links in text and replace them."
 msgstr "Kjenn att lenkjer i teksten, og byt dei ut."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Recognize smileys in text and replace them with images."
-msgstr "Kjenn att smilefjes i teksten, og byt dei ut med bilete."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Run junk test on incoming mail."
+msgstr "Kontroller om ny e-post er skrotpost."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Run junk test on incoming mail"
-msgstr "Kontroller om ny e-post er skrot"
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Save directory"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Send HTML mail by default"
 msgstr "Send e-post i HTML-format som standard"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Send HTML mail by default."
 msgstr "Send e-post i HTML-format som standard."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Show Animations"
 msgstr "Vis animasjonar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilete som animasjonar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis sletta meldingar (gjennomstreka) i meldingslista."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Show deleted messages in the message-list"
 msgstr "Vis sletta meldingar i meldingslista"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
-msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Show photo of the sender"
 msgstr ""
-"Vis e-post-adressa til avsendar i den samansette meldingskolonna i "
-"meldingslista"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Vis e-post-adressa til avsendar i meldingskolonna i meldingslista"
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "Vis e-post-adressa til avsendar i ei eiga kolonna i meldingslista."
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
-msgid "Sound file to play when new mail arrives."
-msgstr "Lydfil å spela når det kjem ny e-post."
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Oppgjev typen varsel brukaren vil ha når det kjem my e-post."
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Specifies the header to check for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid ""
+"Specifies the header to check for junk. The format is headername=value in "
+"gconf."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Spell check inline"
 msgstr "Stavekontroller etterkvart"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default height"
 msgstr "Standardhøgde på abonneringsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Subscribe dialog default width"
 msgstr "Standardbreidde på abonneringsdialogen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Terminal font"
 msgstr "Terminalskrifttype"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Text message part limit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:123
+#, fuzzy
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "Tida papirkorga vart tømt sist, i dagar sidan epoch."
+
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Tida papirkorga vart tømt sist, i dagar sidan epoch."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-msgid "The terminal font for mail display"
-msgstr "Terminalskrifttypen brukt til å visa e-post"
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "The terminal font for mail display."
+msgstr "Terminalskrifttypen brukt til å visa e-post."
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "The variable width font for mail display."
+msgstr "Skrifttype med variabel breidde brukt til å visa e-post."
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+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 "
+"to the other available plugins."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
-msgid "The variable width font for mail display"
-msgstr "Skrifttype med variabel breidde brukt til å visa e-post"
+#: ../mail/evolution-mail.schemas.in.h:130
+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."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:131
 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;"
@@ -12767,7 +12987,11 @@ msgstr ""
 "strukturen er &lt;header enabled&gt;: slår på dersom meldingshovudlinja skal "
 "visast i e-post-framsyninga."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12775,103 +12999,120 @@ msgstr ""
 "Dette set talet på adresser å visa i den vanlege meldingslisteframsyninga. "
 "Etter dette vert «...» vist."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+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 "
+"restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Thread the message list."
 msgstr "Vis tråda meldingsliste."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Thread the message-list"
 msgstr "Vis tråda meldingsliste"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Thread the message-list based on Subject"
 msgstr "Sorter meldingslista i trådar etter emne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Timeout for marking message as seen"
 msgstr "Tid å venta før melding er lesen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Timeout for marking message as seen."
 msgstr "Tid å venta før melding er lesen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "UID string of the default account."
 msgstr "UID-streng til standardkontoen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
-msgid "Use Spamassassin daemon and client"
-msgstr "Bruk Spamassassin-nissen og -klienten"
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Use SpamAssassin daemon and client"
+msgstr "Bruk SpamAssassin-nissen og -klienten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "Bruk Spamassassin-nissen og -klienten (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Bruk SpamAssassin-nissen og -klienten (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Use custom fonts"
 msgstr "Bruk sjølvvalde skrifttypar"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "Use custom fonts for displaying mail"
-msgstr "Bruk sjølvvalde skrifttypar til å visa e-post"
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Use custom fonts for displaying mail."
+msgstr "Bruk sjølvvalde skrifttypar til å visa e-post."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only local spam tests."
 msgstr "Bruk berre lokale skrot-testar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk berre lokale skrot-testar (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Use side-by-side or wide layout"
 msgstr "Bruk side-ved-side- eller brei utforming"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Variable width font"
 msgstr "Skrifttype med variabel breidde"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "View/Bcc menu item is checked"
 msgstr "Vis/Bcc-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "View/Bcc menu item is checked."
 msgstr "Vis/Bcc-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "View/Cc menu item is checked"
 msgstr "Vis/Cc-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "View/Cc menu item is checked."
 msgstr "Vis/Cc-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "View/From menu item is checked"
 msgstr "Vis/Frå-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "View/From menu item is checked."
 msgstr "Vis/Frå-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "View/PostTo menu item is checked"
 msgstr "Vis/Post til-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "View/PostTo menu item is checked."
 msgstr "Vis/Post til-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vis/Svar til-menyoppføring er merka"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vis/Svar til-menyoppføring er merka."
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12879,33 +13120,35 @@ msgstr ""
 "Om meldingslista skal trådast etter emne når meldingane ikkje inneheld In-"
 "Reply-To eller References i meldingshovudet."
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Width of the message-list pane"
 msgstr "Høgda på meldingslistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Width of the message-list pane."
 msgstr "Høgda på meldingslistefeltet."
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:184
 msgid "Importing Elm data"
 msgstr "Importerer Elm-data"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:369
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-importerar"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:370
 msgid "Import mail from Elm."
 msgstr "Importerer e-post frå Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Vel mappe å importera til"
 
@@ -12917,120 +13160,29 @@ msgstr "Berkeley-e-postboks (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importerer Berkeley-e-postmapper (mbox)"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "Importerer «%s»"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "Vent litt"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
 #, c-format
-msgid "Scanning %s"
-msgstr "Søkjer gjennom %s"
+msgid "Importing `%s'"
+msgstr "Importerer «%s»"
 
-#: ../mail/importers/netscape-importer.c:74
+#: ../mail/importers/mail-importer.c:372
 #, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Prioritetsfilter: «%s»"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Ein del av e-postfiltera du har i Netscape er tufta på\n"
-"e-postprioritetar, som Evolution ikkje brukar. I staden\n"
-"brukar Evolution poeng frå -3 til 3. Desse kan tildelast\n"
-"e-postar som så kan filtrerast ut frå dette.\n"
-"\n"
-"For å koma utanom dette problemet finst det eit sett med\n"
-"filter som heiter «prioritetsfilter». Dei kan rekna om Netscape\n"
-"sine e-postprioritetar til Evolution sine poeng, og dei\n"
-"Netscape-filtera det gjeld, kan dermed bruka poeng i staden for\n"
-"prioritetar. Kontroller dei importerte filtera for å vera\n"
-"sikker på at alt virkar som før."
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Nokre av Netscape-e-postfiltera dine brukar\n"
-"«Oversjå tråd» eller «Følg med på tråd»-eigenskapene,\n"
-"som ikkje er støtta i Evolution. Desse filtera\n"
-"vil verta forkasta."
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Nokon av Netscape-e-postfiltera dine testar\n"
-"meldingskroppen i e-postane dine om dei er lik\n"
-"eller ulik ein gjeven streng. Evolution støttar\n"
-"ikkje slik testing, så desse filtera er endra til\n"
-"å testa om den gjevne strengen er ein del av\n"
-"meldingskroppen eller ikkje."
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution importerer gamle Netscape-data"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "Importerer Netscape-data"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "Innstillingar"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "E-postfilter"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution har funne Netscape-e-postfilter.\n"
-"Vil du importera dei til Evolution?"
+msgid "Scanning %s"
+msgstr "Søkjer gjennom %s"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Importerer Pine-data"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-importerar"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
 msgid "Import mail from Pine."
 msgstr "Importer e-post frå Pine."
 
@@ -13058,166 +13210,198 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:536
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d vald, "
+msgstr[1] "%d valde, "
+
+#: ../mail/mail-component.c:540
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d sletta"
 msgstr[1] "%d sletta"
 
-#: ../mail/mail-component.c:526
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d skrot"
 msgstr[1] "%d skrot"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d utkast"
 msgstr[1] "%d utkast"
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendte"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:555
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d ulesen, "
+msgstr[1] "%d ulesne, "
+
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d samanlagt"
 msgstr[1] "%d samanlagt"
 
-#: ../mail/mail-component.c:559
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d ulesen"
-msgstr[1] ", %d ulesne"
-
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:896
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:897
 msgid "_Mail Message"
 msgstr "_E-post"
 
-#: ../mail/mail-component.c:843
+#: ../mail/mail-component.c:898
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:904
 msgid "New Mail Folder"
 msgstr "Ny e-post-mappe"
 
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:905
 msgid "Mail _Folder"
 msgstr "E-post-_mappe"
 
-#: ../mail/mail-component.c:851
+#: ../mail/mail-component.c:906
 msgid "Create a new mail folder"
 msgstr "Lag ny e-post-mappe"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:1053
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Klarte ikkje å oppgradera e-post-innstillingane eller mappene."
 
-#: ../mail/mail-config.c:85
-msgid "I_mportant"
-msgstr "_Viktig"
+#: ../mail/mail-component.c:1522
+msgid "Error"
+msgstr ""
 
-#. red
-#: ../mail/mail-config.c:86
-msgid "_Work"
-msgstr "_Arbeid"
+#: ../mail/mail-component.c:1522
+msgid "Errors"
+msgstr ""
 
-#. orange
-#: ../mail/mail-config.c:87
-msgid "_Personal"
-msgstr "_Personleg"
+#: ../mail/mail-component.c:1523
+msgid "Warnings and Errors"
+msgstr ""
 
-#. forest green
-#: ../mail/mail-config.c:88
-msgid "_To Do"
-msgstr "_Hugseliste"
+#: ../mail/mail-component.c:1524
+msgid "Debug"
+msgstr ""
 
-#. blue
-#: ../mail/mail-config.c:89
-msgid "_Later"
-msgstr "_Seinare"
+#: ../mail/mail-component.c:1524
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1634
+msgid "Debug Logs"
+msgstr "Feilsøkingsloggar"
+
+#: ../mail/mail-component.c:1638
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#: ../mail/mail-component.c:1645
+msgid "seconds."
+msgstr "sekund."
+
+#: ../mail/mail-component.c:1655
+msgid "Log Messages:"
+msgstr "Loggmeldingar:"
+
+#: ../mail/mail-component.c:1707
+msgid "Log Level"
+msgstr ""
+
+#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "Tid"
+
+#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Meldingar"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL er ikkje støtta i denne varianten av Evolution</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>Bilete av avsendar</b>"
+
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sig_naturar</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>S_pråk</b>"
 
-#: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Dette vil gjera filteret meir påliteleg, men tregare</small>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">Autentiseringstype</span>"
-
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentisering</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Skriva meldingar</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Oppsett</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Vanleg åtferd</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Slett e-post</span>"
 
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">Meldings_hovudlinjer som vert viste</span>"
-
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">Filterval</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">Meldings_hovud som vert viste</span>"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Merkelappar og fargar</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Merkelappar</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13236,46 +13420,46 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Meldingskvitteringar</span>"
 
 #: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">Varsla om ny e-post</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\">Valfri informasjon</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Brukarval</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Typesnitt i utskrift</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Påkravd informasjon</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Tryggleik</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Utkast og sendte meldingar</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tenaroppsett</span>"
 
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">_Autentiseringstype</span>"
+
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Kontostyring"
@@ -13293,7 +13477,8 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Signer alle utgåande meldingar frå denne kontoen"
 
 #: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
+#, fuzzy
+msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Krypter óg til meg sjølv når eg sender kryptert e-post"
 
 #: ../mail/mail-config.glade.h:39
@@ -13309,65 +13494,67 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr "S_tol alltid på nøklar i nøkkelringen min ved kryptering"
 
 #: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
+#, fuzzy
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg sjølv når eg sender e-post"
 
 #: ../mail/mail-config.glade.h:43
+msgid "Always request rea_d receipt"
+msgstr "Alltid be om _lesekvittering"
+
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Legg ved opprinneleg melding"
 
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
-msgstr "Sett inn _smilefjes automatisk"
-
 #: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "Sett inn _smilefjesbilete automatisk"
+
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
-msgid "Beep w_hen new mail arrives"
-msgstr "Pip _når det kjem ny e-post"
-
 #: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "T_eiknsett:"
 
 #: ../mail/mail-config.glade.h:50
+#, fuzzy
+msgid "C_heck custom headers for junk"
+msgstr "Sjå etter skrot i _inngåande post"
+
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
 
-#: ../mail/mail-config.glade.h:51
-msgid "Check in_coming mail for junk"
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
 msgstr "Sjå etter skrot i _inngåande post"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Kontroller s_tavinga medan eg skriv"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ser etter om ny e-post er skrot"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstava ord:"
 
-#: ../mail/mail-config.glade.h:57
-msgid "Colors"
-msgstr "Fargar"
-
 #: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "_Stadfest ved tøming av mappe"
@@ -13396,108 +13583,136 @@ msgstr "_Standard"
 msgid "Default character e_ncoding:"
 msgstr "Standardt_eiknsett:"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Signer utgåande meldingar _digitalt (som standard)"
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:70
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Signer utgåande meldingar _digitalt (som standard)"
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:73
 msgid "Do not quote original message"
 msgstr "Ikkje siter opprinneleg melding"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "_Utkastmappe:"
 
-#: ../mail/mail-config.glade.h:73
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "S_lå på"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "E-post-kontoar"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkorga ved slutt"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "B_ruk søkemapper"
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "Kry_pteringssertifikat:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter _utgåande meldingar (som standard)"
 
-#: ../mail/mail-config.glade.h:80
-msgid "Fi_xed width Font:"
-msgstr "Skrifttype med fast teikn_breidde:"
-
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "Fast _breidde:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr "Skrifttype med fast teikn_breidde:"
+
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "Skrifttypeeigenskapar"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "Formater meldingar med _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "_Fullt namn:"
 
-#: ../mail/mail-config.glade.h:86
-msgid "HTML Mail"
-msgstr "HTML-e-post"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr "HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:91
 msgid "Headers"
 msgstr "Meldingshovud"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:92
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:89
-msgid "I_nclude remote tests"
-msgstr "Ta _med eksterne testar"
-
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Innvevd"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
+msgid "Inline original message (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:97
+msgid "KB"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Merkelappar"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Headers Table"
 msgstr "E-posthovud-tabell"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:104
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13505,19 +13720,15 @@ msgstr ""
 "Merk at du vil ikkje verta spurd om passordet før du koplar deg på for "
 "fyrste gong"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:107
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:108
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Play sound file when new mail arri_ves"
-msgstr "Spel lydfil når det _kjem ny e-post"
-
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13525,7 +13736,7 @@ msgstr ""
 "Skriv eit skildrande namn på denne kontoen i linja under.\n"
 "Dette namnet vert berre brukt til å visa på skjermen."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13533,7 +13744,7 @@ msgstr ""
 "Skriv inn informasjon om korleis du vil senda e-post. Dersom du ikkje er "
 "sikker, bør du spørja systemansvarleg eller internettleverandøren din."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:113
 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 "
@@ -13542,122 +13753,114 @@ msgstr ""
 "Skriv namnet og e-post-adressa di under. Dei valfrie felta treng du ikkje "
 "fylla inn viss du ikkje vil ha med denne informasjonen i e-post du sender."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "Vel frå desse vala"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "Siter opprinneleg melding"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "Hu_gs passordet"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Hugs _passordet"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "_Vel..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "Send meldingskvitteringar:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "S_tandard skrifttype:"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Se_lect..."
-msgstr "_Vel..."
-
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML fixed width font"
 msgstr "Vel skrifttype med fast breidde, til HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font for printing"
 msgstr "Vel skrifttype med fast breidde, til utskrift av HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML variable width font"
 msgstr "Vel skrifttype med variabel breidde, til HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font for printing"
 msgstr "Vel skrifttype med variabel breidde, til utskrift av HTML-meldingar"
 
-#: ../mail/mail-config.glade.h:128
-msgid "Select sound file"
-msgstr "Vel lydfil"
-
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Sending Mail"
 msgstr "Senda e-post"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Mappe til sendte _meldingar:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Tenar_type: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
 msgid "Sig_ning certificate:"
 msgstr "Si_gneringssertifikat:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Signaturar"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
 msgid "Signatures Table"
 msgstr "Signaturtabell"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Specify _filename:"
-msgstr "Oppgje _filnamn:"
-
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Denne lista av språk inneheld berre språk du har installert ordliste til."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13669,21 +13872,27 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:146
 msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
+msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 "Skriv eit namn du vil bruka til å referera til denne kontoen.\n"
 "Til dømes: «Arbeid» og «Personleg»"
 
-#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13702,8 +13911,8 @@ msgid "_Always load images from the Internet"
 msgstr "Last _alltid bilete frå nettet"
 
 #: ../mail/mail-config.glade.h:156
-msgid "_Do not notify me when new mail arrives"
-msgstr "Ikkje varsla når det kjem _ny e-post"
+msgid "_Default junk plugin:"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
@@ -13715,68 +13924,80 @@ msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
 #: ../mail/mail-config.glade.h:160
-msgid "_Load images in mail from contacts"
-msgstr "_Last bilete i e-post frå kontaktar"
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:161
+msgid "_Load images in messages from contacts"
+msgstr "_Last bilete i e-post frå kontaktar"
+
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lesne etter"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "Last aldri bilete frå _nettet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
+#: ../mail/mail-config.glade.h:171
+msgid "_Select..."
+msgstr "_Vel ..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Show image animations"
 msgstr "Vi_s animasjonar"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:176
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Krymp Til/Cc/Bcc-hovud til"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:177
 msgid "_Use Secure Connection:"
 msgstr "Br_uk trygg tilkopling:"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk dei same skrifttypane som andre program"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:179
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:180
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:181
 msgid "description"
 msgstr "skildring"
 
@@ -13812,7 +14033,7 @@ msgstr "Alle lokale mapper"
 msgid "Case _sensitive"
 msgstr "_Skil mellom små og store bokstavar"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "F_erdig"
 
@@ -13824,8 +14045,7 @@ msgstr "_Finn:"
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
 msgid "Flag to Follow Up"
 msgstr "Merk med Skal følgjast opp"
 
@@ -13853,7 +14073,7 @@ msgstr "Tryggleiksinformasjon"
 msgid "Specific folders"
 msgstr "Bestemte mapper"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13865,11 +14085,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "_Godta lisens"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "_Ferdig innan:"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "_Flagg:"
 
@@ -13877,26 +14097,26 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensavtalen"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:826
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
 #: ../mail/mail-ops.c:105
-msgid "Filtering Folder"
-msgstr "Filtrerer mappe"
+msgid "Filtering Selected Messages"
+msgstr ""
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Klarte ikkje bruka utgåande filter: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13905,12 +14125,16 @@ msgstr ""
 "Klarte ikkje å leggja til i «%s»: %s\n"
 "Legg til i lokal «Sendt»-mappe i staden."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kan ikkje leggja til i lokal «Sendt»-mappe: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "Sender melding"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
@@ -13920,15 +14144,15 @@ msgstr "Sender melding %d av %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Klarte ikkje senda %d av %d meldingar"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
 msgid "Canceled."
 msgstr "Avbroten."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
 msgid "Complete."
 msgstr "Ferdig."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
@@ -13942,77 +14166,77 @@ msgstr "Flyttar meldingar til %s"
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1270
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1430
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1493
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrar kontoen «%s»"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1494
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar kontoen «%s»"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1548
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1632
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1633
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1821
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mottek %d melding"
 msgstr[1] "Mottek %d meldingar"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1906
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrar %d melding"
 msgstr[1] "Lagrar %d meldingar"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1976
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14021,11 +14245,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2048
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14034,46 +14258,52 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2076
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skriva data: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2222
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2222
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2318
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr ""
+
+#: ../mail/mail-ops.c:2404
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Avbryt ..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:393
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:400
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:510
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:810
+#, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
 
@@ -14096,7 +14326,7 @@ msgstr "Tast inn passord for %s"
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
@@ -14109,7 +14339,6 @@ msgid "Enter a name for this signature."
 msgstr "Gje signaturen eit namn."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "Namn:"
 
@@ -14139,35 +14368,40 @@ msgstr "Vidaresendt melding"
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkjemappe: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Oppdaterer søkjemapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkjemapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1059
 msgid "Edit Search Folder"
 msgstr "Redigér søkjemappe"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1148
 msgid "New Search Folder"
 msgstr "Ny søkjemappe"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
+"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgstr "Ei mappe som heiter «{0}» finst frå før. Bruk eit anna namn."
+
+#: ../mail/mail.error.xml.h:2
+msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «{1}» finst frå før. Bruk eit anna namn."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:3
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14179,46 +14413,46 @@ msgstr ""
 "Du kan oversjå denne mappa, skriva over henne, leggja til innhaldet, eller "
 "avslutta."
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
 msgstr ""
 "«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "Ein signatur som heiter «{0}» finst frå før. Bruk eit anna namn."
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 "Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Er du sikker på at du vil sletta denne kontoen og mellomtenarane hans?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne kontoen?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil kopla ut denne kontoen og sletta alle dei "
 "tilhøyrande mellomtenarane?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Er du sikker på at du vil opna {0} meldingar på ein gong?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14226,7 +14460,7 @@ msgstr ""
 "Er du sikker på at du vil fjerna dei sletta meldingane i alle mappene for "
 "godt?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14234,80 +14468,80 @@ msgstr ""
 "Er du sikker på at du vil fjerna alle dei sletta meldingane i mappa «{0}» "
 "for godt?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Er du sikker på at du vil senda ei melding i HTML-format?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil senda meldinga utan emne?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Fordi «{0}»."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Fordi «{2}»."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tom signatur"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Kan ikkje leggja til søkjemappa «{0}»."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kan ikkje kopiera mappa «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kan ikkje laga mappa «{0}»."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Klarte ikkje å laga mellombels katalog."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Kan ikkje laga katalogen, fordi «{0}»"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kan ikkje sletta mappa «{0}»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Kan ikkje sletta systemmappa «{0}»."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Kan ikkje redigera den søkjemappa «{0}», sia ho ikkje finst."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kan ikkje flytta mappa «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Klarte ikkje opna kjelda «{1}»"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Klarte ikkje opna kjelda «{2}»."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Kan ikkje opna målet «{2}»."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14316,31 +14550,31 @@ msgstr ""
 "Kan ikkje lesa lisensfila «{0}» på grunn av eit installasjonsproblem. Du kan "
 "ikkje bruka denne leverandøren før du godtek lisensen."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kan ikkje gje «{0}» det nye namnet «{1}»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Kan ikkje byta namn på eller flytta systemmappa «{0}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Kan ikkje lagra endringane i kontoen."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kan ikkje lagra i katalogen «{0}»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Kan ikkje lagra i fila «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Kan ikkje velja signaturskriptet «{0}»."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14348,72 +14582,90 @@ msgstr ""
 "Kontroller at passordet ditt er skrive rett. Hugs at mange passord ser "
 "skilnad på store og små bokstavar. Sjå etter om Caps Lock er på."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Kan ikkje lagra signaturfila."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Sletta «{0}»?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Sletta kontoen?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:47
 msgid "Discard changes?"
 msgstr "Forkasta endringar?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:48
+msgid "Do not d_elete"
+msgstr "Ikkje _slett"
+
+#: ../mail/mail.error.xml.h:49
 msgid "Do not delete"
 msgstr "Ikkje slett"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
 msgid "Do not disable"
 msgstr "Ikkje skru av"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "Vil du at operasjonen skal gjerast i undermappene?"
+#: ../mail/mail.error.xml.h:51
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "Vil du at operasjonen også skal utførast i undermappene?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merka alle meldingar som lesne?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagra endringane?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Skriv inn passordet."
 
 # TRN: Dårleg.
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Feil under lesing av filterdefinisjonar."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Feil medan handlinga vart utført."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Fila finst, men kan ikkje skriva over."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Fila finst, men er ikkje ei vanleg fil."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Dersom du held fram, vil du ikkje kunna gjenoppretta desse meldingane."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14421,13 +14673,13 @@ msgstr ""
 "Dersom du slettar mappa, vil alt innhaldet og alle undermappene forsvinna "
 "for godt."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Dersom du held fram, vil all informasjon om kontoar på mellomtenarar verta "
 "sletta for godt."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14435,11 +14687,11 @@ msgstr ""
 "Dersom du held fram, vil konto- og \n"
 "mellomtenarinformasjon verta sletta for godt."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Dersom du held fram, vil kontoen verta sletta for godt."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14447,19 +14699,19 @@ msgstr ""
 "Dersom du avsluttar, vil ikkje desse meldingane verta sendte før Evolution "
 "vert starta att."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "E-post-filter er oppdaterte automatisk."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 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 "
@@ -14471,39 +14723,39 @@ msgstr ""
 "lista opp alle mottakarane av meldinga. For å unngå dette bør du leggja til "
 "minst ein Til:- eller Cc:-mottakar."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Merk alle meldingar som lesne"
 
-#: ../mail/mail.error.xml.h:68
-msgid "Mark all messages in subfolders as read?"
-msgstr "Merka alle meldingar som lesne?"
-
-#: ../mail/mail.error.xml.h:69
-msgid "Mark as _Read"
-msgstr "Mar_ker som lesen"
+#: ../mail/mail.error.xml.h:74
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "Merka alle meldingar i denne mappa og undermappene som lesne?"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Manglande mappe."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:77
 msgid "No sources selected."
 msgstr "Ingen kjelder valde."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:78
+msgid "Only on _Current Folder"
+msgstr "Berre _denne mappa"
+
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr "Å opne for mange meldingar på ein gong kan ta lang tid."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr "Kontroller innstillingane dine og prøv igjen."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "Please enable the account or send using another account."
 msgstr "Slå på denne kontoen eller bruk ein annan konto til å senda med."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 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."
@@ -14511,59 +14763,66 @@ msgstr ""
 "Skriv inn ei gyldig e-post-adresse i «Til:»-feltet. Du kan søkja etter e-"
 "post-adresser ved å klikka på «Til:»-knappen til venstre for mottakarfeltet."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
-"Du sender ei HTML-formatert melding. Pass på at dei følgjande mottakarane er "
-"i stand til å lesa HTML-e-post, og faktisk vil ha slik post:\n"
-"{0}\n"
-"Senda likevel?"
+"Pass på at dei følgjande mottakarane er i stand til å lesa HTML-e-post, og "
+"faktisk vil ha slik post:\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "Gje signaturen eit namn."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "Vent litt."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem under migrering av gamal e-post-mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server"
 msgstr "Spør tenar"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tenar om ei liste av støtta autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:90
 msgid "Read receipt requested."
 msgstr "Lesekvitteringar etterspurd."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Verkeleg sletta mappa «{0}» og alle undermappene?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Søkjemapper vert oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Sendekvittering"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Sertifikatet finst frå før"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "Synkroniser"
+
+#: ../mail/mail.error.xml.h:96
+#, fuzzy
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Kalenderen er ikkje merka for fråkopla bruk"
+
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14571,7 +14830,7 @@ msgstr ""
 "Systemmapper trengst for at Ximian Evolution skal fungera rett, og kan ikkje "
 "få nytt namn, flyttast eller slettast."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14587,7 +14846,7 @@ msgstr ""
 "lista opp alle mottakarane av meldinga. For å unngå dette bør du leggja til "
 "minst ein Til:- eller Cc:-mottakar. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14601,7 +14860,7 @@ msgstr ""
 "    «{1}»\n"
 "som er fjerna. Mappene er oppdaterte."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14615,11 +14874,11 @@ msgstr ""
 "    «{1}»\n"
 "som er fjerna. Reglane er oppdaterte."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "Skriptfila må finnast og vera køyrbar."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14627,31 +14886,31 @@ msgstr ""
 "Mappa kan ha blitt lagt til implisitt. Det kan vera naudsynt å opna "
 "søkjemappe-redigering og leggja henne til eksplisitt."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 "SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Signaturen er endra, men ikkje lagra."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14659,11 +14918,11 @@ msgstr ""
 "Dette vil merka alle meldingar som lesne i den valde mappa og alle "
 "undermappene."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Klarte ikkje kopla til GroupWise-tenar."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14671,39 +14930,46 @@ msgstr ""
 "Kan ikkje opna kladd-mappa til denne kontoen. Vil du bruka standard-"
 "kladdmappa?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Kan ikkje lesa lisensfil."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Bruk stan_dard"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Bruka standard utkastmappe?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldingar. Vil du avslutta likevel?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Du må gje søkjemappa eit namn."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Du må oppgje ei mappe."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14713,98 +14979,100 @@ msgstr ""
 "Du kan anten velja mapper ei og ei, eller velja alle lokale mapper, alle "
 "eksterne mapper, eller begge delar."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Innlogginga på tenaren «{0}» som «{0}» feila."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Forkast endringar"
 
-#: ../mail/mail.error.xml.h:127
-msgid "_Do not Mark as Read"
-msgstr "Ikkje _marker som lesen"
+#: ../mail/mail.error.xml.h:137
+#, fuzzy
+msgid "_Do not Synchronize"
+msgstr "_Ikkje gjenopprett"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Opna meldingar"
 
-#: ../mail/message-list.c:1019
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+msgid "on Current Folder and _Subfolders"
+msgstr "Lag undermapper"
+
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Svara"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Lavast"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Senk"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Høgare"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Høgast"
 
-#: ../mail/message-list.c:1466 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1473 ../plugins/itip-formatter/itip-view.c:202
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "I dag, %l:%M:%p"
 
-#: ../mail/message-list.c:1482 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "I går, %l:%M:%p"
 
-#: ../mail/message-list.c:1494 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1502 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1504 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: ../mail/message-list.c:2259 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "Meldingar"
-
-#: ../mail/message-list.c:3647
+#: ../mail/message-list.c:3849
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -14824,15 +15092,15 @@ msgstr "Flagga"
 msgid "Follow Up Flag"
 msgstr "Oppfølgjingsflagg"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Mottatt"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "Sendte meldingar"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Storleik"
@@ -14861,15 +15129,15 @@ msgstr "Vidaresend"
 msgid "No Response Necessary"
 msgstr "Svar trengst ikkje"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
 msgid "Review"
 msgstr "Sjå gjennom"
 
@@ -14905,6 +15173,65 @@ msgstr "Lokale adressebøker"
 msgid "Provides core functionality for local address books."
 msgstr "Leverer grunnleggjande funksjonar for lokale adressebøker."
 
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#, fuzzy
+msgid "Enable attachment reminder plugin"
+msgstr "Slå av og på programtillegg"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+#, fuzzy
+msgid "Enable attachment reminder plugin."
+msgstr "Slå av og på programtillegg"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+msgid "Keywords"
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+#, fuzzy
+msgid "Remind _missing attachments"
+msgstr "Lagrar vedlegg"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "Vedleggslinje"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#, fuzzy
+msgid "Message has no attachments"
+msgstr "Meldingar med vedlegg"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#, fuzzy
+msgid "_Continue Editing"
+msgstr "Hald fram"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14917,38 +15244,137 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Innskoten lyd-tillegg"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:96
+#, fuzzy
+msgid "Select name of the Evolution backup file"
 msgstr "Vel namn på Evolution-arkiv"
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "_Start Evolution på nytt etter tryggleikskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:139
+#, fuzzy
+msgid "Select name of the Evolution backup file to restore"
 msgstr "Vel Evolution-arkiv som skal gjenopprettast"
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr "_Start Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+#, fuzzy
+msgid "Restore from backup"
+msgstr "_Start Evolution på nytt etter tryggleikskopiering"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:244
+#, fuzzy
+msgid "_Restore Evolution from the backup file"
+msgstr "_Start Evolution på nytt etter tryggleikskopiering"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+#, fuzzy
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Vel Evolution-arkiv som skal gjenopprettast"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+#, fuzzy
+msgid "Choose a file to restore"
+msgstr "Vel ei fil"
+
+#: ../plugins/backup-restore/backup.c:40
 msgid "Backup Evolution directory"
 msgstr "Tryggleikskopiér Evolution-mappa"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mappa"
 
-#: ../plugins/backup-restore/backup.c:113
-msgid "Check Evolution archive"
+#: ../plugins/backup-restore/backup.c:44
+#, fuzzy
+msgid "Check Evolution Backup"
 msgstr "Kontroller Evolution-arkivet"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
+#: ../plugins/backup-restore/backup.c:48
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
+#, fuzzy
+msgid "Shutting down Evolution"
+msgstr "Avsluttar %s (%s)\n"
+
+#: ../plugins/backup-restore/backup.c:74
+#, fuzzy
+msgid "Backing Evolution accounts and settings"
+msgstr "Sikkerhetskopiér og gjenopprett Evolution-data og innstillingar"
+
+#: ../plugins/backup-restore/backup.c:78
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:88
+#, fuzzy
+msgid "Backup complete"
+msgstr "_Merk som uferdige"
+
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
+#, fuzzy
+msgid "Restarting Evolution"
+msgstr "Start Evolution på nytt"
+
+#: ../plugins/backup-restore/backup.c:114
+#, fuzzy
+msgid "Backup current Evolution data"
+msgstr "Tryggleikskopiér Evolution-mappa"
+
+#: ../plugins/backup-restore/backup.c:119
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:125
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "Endra innstillingane til Evolution"
+
+#: ../plugins/backup-restore/backup.c:129
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:249
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
+msgstr "Setter opp søkjemappe: %s"
+
+#: ../plugins/backup-restore/backup.c:254
+#, fuzzy, c-format
+msgid "Restoring from the folder %s"
+msgstr "Fjernar mappe %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:270
+#, fuzzy
+msgid "Evolution Backup"
+msgstr "Evolution e-post"
+
+#: ../plugins/backup-restore/backup.c:270
+#, fuzzy
+msgid "Evolution Restore"
+msgstr "Evolution-test"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -14960,50 +15386,94 @@ msgstr ""
 msgid "Backup and restore plugin"
 msgstr "Tillegg for sikkerheitskopiering og gjenoppretting"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "Val for sikkerhetskopiering..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#, fuzzy
+msgid "Are you sure you want to close Evolution?"
+msgstr "Er du sikker på at du vil sletta denne kontoen?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Er du sikker på at du vil sletta dette møtet?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Invalid Evolution backup file"
+msgstr "Evolution e-post"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
+msgid "Please select a valid backup file to restore."
+msgstr "Vel Evolution-arkiv som skal gjenopprettast"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "Sikkerhetskopiér og gjenopprett Evolution-data og innstillingar"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
+msgid "R_estore Settings..."
 msgstr "Gjenopprettingsinnstillingar..."
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "_Backup Settings..."
+msgstr "Val for sikkerhetskopiering..."
+
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontaktar"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
+#: ../plugins/bbdb/bbdb.c:565
+#, fuzzy
 msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+"_Automatically create entries in the addressbook when responding to messages"
 msgstr "Legg _automatisk kontaktar til i adresseboka når du svarar på e-post"
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vel adressebok for automatiske kontaktar"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:586
 msgid "Instant Messaging Contacts"
 msgstr "Lynmelding-kontaktar"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:601
+#, fuzzy
 msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
 msgstr ""
 "Jamnleg synkronisera kontaktinformasjon og bilete frå kameratlista i Gaim"
 
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
+#: ../plugins/bbdb/bbdb.c:607
+#, fuzzy
+msgid "Select Address book for Pidgin buddy list"
 msgstr "Vel adressebok for Gaim-venneliste"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:618
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisér med kontaktliste no"
 
@@ -15021,14 +15491,54 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+msgid "Convert message text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+#, fuzzy
+msgid "Convert mail messages to Unicode"
+msgstr "Post ei melding til ei offentleg mappe"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "Loggfør filterhandlingar"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr ""
+
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:135
+msgid "_URL:"
+msgstr "_Adresse:"
+
 #: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:351
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+#, fuzzy
+msgid "CalDAV Calendar sources"
+msgstr "Lokale kalendrar"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+#, fuzzy
+msgid "CalDAV sources"
+msgstr "Standardkjelder"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Lokale kalendrar"
@@ -15037,10 +15547,21 @@ msgstr "Lokale kalendrar"
 msgid "Provides core functionality for local calendars."
 msgstr "Gjer kjernefunksjonalitet for lokale kalendrar."
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:375
+msgid "_Refresh:"
+msgstr "_Oppdater:"
+
+#: ../plugins/calendar-http/calendar-http.c:341
 msgid "_Secure connection"
 msgstr "_Trygg tilkopling"
 
+#: ../plugins/calendar-http/calendar-http.c:406
+#, fuzzy
+msgid "Userna_me:"
+msgstr "Br_ukarnamn:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP-kalendrar"
@@ -15082,16 +15603,16 @@ msgstr "Vér: Tordenvér"
 msgid "Select a location"
 msgstr "Vel ein stad"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "_Einingar:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrisk (Celcius, cm, osv)"
 
 # TRN: Finn betre ord?
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperisk (Fahrenheit, tommar, osv.)"
 
@@ -15115,11 +15636,11 @@ msgstr ""
 msgid "Copy tool"
 msgstr "Kopiverktøy"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Kontroller om Evolution er standard e-post-program"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -15138,8 +15659,13 @@ msgstr "Standard e-postklient"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vil du gjera Evolution til standard e-postlesar?"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:626
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as _default folder"
 msgstr "Merk som _standardmappe"
 
@@ -15148,9 +15674,10 @@ msgid "Default Sources"
 msgstr "Standardkjelder"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
 msgid ""
-"Provides functionallity for marking a calendar or addressbook as the default "
-"one."
+"Provides functionality for marking a calendar or an addressbook as the "
+"default one."
 msgstr ""
 "Leverer funksjonar for å gjera ein kalender eller ei adressebok til standard "
 "kalender/bok."
@@ -15235,7 +15762,8 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "Handsama delegat-innstillingane for Exchange-konto"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+#, fuzzy
+msgid "Delegation Assistant"
 msgstr "Delegeringsassistent"
 
 #. Miscelleneous settings
@@ -15257,24 +15785,37 @@ msgstr "Mappestorleik"
 msgid "Exchange Settings"
 msgstr "Exchange-innstillingar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:625
 msgid "_OWA URL:"
 msgstr "_OWA-adresse:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:651
 msgid "A_uthenticate"
 msgstr "A_utentiser"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#, fuzzy
+msgid "_Authentication Type"
 msgstr "Autentiseringstype"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:868
 msgid "Ch_eck for Supported Types"
 msgstr " _Søk etter støtta typar"
 
+#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%ld KiB"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, fuzzy, c-format
+msgid "0 KB"
+msgstr "%ld KiB"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15318,68 +15859,112 @@ msgstr "Ditt noverande passord har gått ut. Byt passordet ditt no."
 msgid "Your password will expire in the next %d days"
 msgstr "Passordet ditt går ut om %d dagar"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:164
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1572
 msgid "Custom"
 msgstr "Tilpassa"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "Redaktør (lesa, laga, redigera)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Forfattar (lesa, laga)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "Gjennomlesar (berre lesa)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:252
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegattilgjenge"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:263
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 msgstr "Løyve 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:353
+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 ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#, fuzzy
+msgid "You are also permitted to see my private items."
+msgstr "_Delegat kan sjå private oppføringar"
+
+#. 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:383
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "Delegér til"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Fjerna delegaten %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 msgid "Could not access Active Directory"
 msgstr "Klarte ikkje å kopla til Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr "Klarte ikkje å finna seg sjølve i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Klarte ikke finna delegaten %s i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Klarte ikkje å fjerna delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 msgid "Could not update list of delegates."
 msgstr "Klarte ikkje å oppdatera lista over delegatar."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Klarte ikkje å legga til delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 msgid "Error reading delegates list."
 msgstr "Feil ved lesing av delegatliste."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Forfattar (lesa, laga)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
@@ -15394,18 +15979,10 @@ msgstr "K_ontaktar: "
 msgid "Delegates"
 msgstr "Delegatar"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "Redaktør (lesa, laga, redigera)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "Løyve for"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "Gjennomlesar (berre lesa)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15423,25 +16000,30 @@ msgstr "_Delegat kan sjå private oppføringar"
 msgid "_Inbox:"
 msgstr "_Innboks:"
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+#, fuzzy
+msgid "_Summarize permissions"
+msgstr "Delegattilgjenge"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "_Oppgåver:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/exchange-folder-permission.c:61
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Løyve ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
 msgid "Folder Name"
 msgstr "Mappenamn"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
 msgid "Folder Size"
 msgstr "Mappestorleik"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Tinga annan brukar si mappe"
@@ -15451,23 +16033,71 @@ msgid "Exchange Folder Tree"
 msgstr "Exchange-mappetre"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "Slutt å tinga mappe ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Verkeleg slutta å tinga mappa «%s»?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Slutta å tinga «%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>No er statusen din «ikkje på kontoret».</b>\n"
+"\n"
+"Vil du endra statusen til «på kontoret»? "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Ikkje på kontoret-melding:</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>Meldinga under vil automatisk verta sendt til alle som sender e-post "
+"til deg\n"
+"medan du ikkje er på kontoret.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Er er på kontoret no"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Eg er ikkje på kontoret no"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Nei, ikkje endra status"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Ikkje på kontoret-assistent"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Endra status"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "Varsel om gamalt passord ..."
@@ -15480,10 +16110,6 @@ msgstr "Passordet ditt vil gå ut om 7 dagar ..."
 msgid "_Change Password"
 msgstr "_Byt passord"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
-msgid "ok_button"
-msgstr "ok_knapp"
-
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Nekta tilgang.)"
@@ -15552,15 +16178,75 @@ msgstr "Leste oppføringar"
 msgid "Role: "
 msgstr "Rolle:"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Nei, ikkje endra status"
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+#, fuzzy
+msgid "<b>Message Settings</b>"
+msgstr "<b>Skrotpostinnstillingar</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+#, fuzzy
+msgid "<b>Tracking Options</b>"
+msgstr "   Alternativ for oppgåveliste</b>                <b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+#, fuzzy
+msgid "Exchange - Send Options"
+msgstr "Exchange-handlingar"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+#, fuzzy
+msgid "I_mportance: "
+msgstr "_Viktig"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+#, fuzzy
+msgid "Request a _delivery receipt for this message"
+msgstr "Be om lesekvittering på alle meldingane eg sender"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+#, fuzzy
+msgid "Request a _read receipt for this message"
+msgstr "Be om lesekvittering på alle meldingane eg sender"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+#, fuzzy
+msgid "Send as Delegate"
+msgstr "Tast inn delegat"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+#, fuzzy
+msgid "_User"
+msgstr "_Brukarnamn:"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+#, fuzzy
+msgid "button-user"
+msgstr "ok_knapp"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "Vel brukar"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 msgid "Address Book..."
 msgstr "Adressebok ..."
 
@@ -15715,7 +16401,7 @@ msgid "Folder offline"
 msgstr "Mappe fråkopla"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1288
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -15763,34 +16449,38 @@ msgid "Password successfully changed."
 msgstr "Passord endra."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Kontroller at namnet på den globale katalogtenaren er rett."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Start Evolution på nytt for å la endringane tre i kraft."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please select a user."
 msgstr "Vel ein brukar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr "Tenaren avslo passordet fordi det er for veikt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange-kontoen vil verte avslått når du avsluttar Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange-kontoen vil verte fjerna når du avsluttar Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange-tenaren er ikkje kompatibel med Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15798,7 +16488,7 @@ msgstr ""
 "Tenaren køyrer Exchange 5.5. Exchange Connector\n"
 "støttar berre Microsoft Exchange 2000 og 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15812,51 +16502,57 @@ msgstr ""
 "\n"
 "Eller du har kanskje skrive passordet feil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr "Prøv på nytt med et anna passord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to add user to access control list:"
 msgstr "Kan ikkje leggja brukar til tilgangslista:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to edit delegates."
 msgstr "Kan ikkje redigere deligatar."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unknown error looking up {0}"
 msgstr "Ukjend feil under leiting etter {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error."
 msgstr "Ukjend feil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown type"
 msgstr "Ukjend type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unsupported operation"
 msgstr "Ikkje støtta operasjon"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Du er nær grensa for kor mykje e-post du kan lagra på tenaren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
 msgstr "Du kan ikkje gjera deg sjølv til din eigen delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Du har gått over grensa for e-postlagring på denne tenaren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr "Du kan berre setja opp ein Exchange-konto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -15864,14 +16560,14 @@ msgstr ""
 "Noverande bruk er: {0} kiB. Prøv å sletta nokre e-postar for å gjera plass "
 "til fleire."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 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."
@@ -15879,19 +16575,19 @@ msgstr ""
 "Noverande bruk er: {0} kiB. Du kan ikkje senda mer e-post før du har rydda "
 "meir plass."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr "Passordet ditt har gått ut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kan ikkje verte lagt i tilgjengelista"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} is already a delegate"
 msgstr "{0} er allereie ein delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already in the list"
 msgstr "{0} er allereie i lista"
 
@@ -15903,7 +16599,53 @@ msgstr "Abonner på annan brukars oppgåver"
 msgid "Check folder permissions"
 msgstr "Kontrollerer mappetilgang"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#, fuzzy
+msgid "External Editor"
+msgstr "Kontaktredigering"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "Standardbreidde på redigeringssvindauget"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr ""
+
+#: ../plugins/face/face.c:57
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:67
+msgid "PNG files"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#, fuzzy
+msgid "_Face"
+msgstr "Frankrike"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#, fuzzy
+msgid "Face"
+msgstr "Frankrike"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Sluttar å tinge mappa «%s»"
@@ -15920,23 +16662,70 @@ msgstr "Slutt å tinge mapper"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnment"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:422
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+#, fuzzy
+msgid "Google"
+msgstr "slå av og på"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup google calendar."
+msgstr "Eit tillegg for å setja opp Hula-kalenderkjelder."
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#, fuzzy
+msgid "Google sources"
+msgstr "Ressursar"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
 msgid "Checklist"
 msgstr "Sjekkliste"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup groupwise calendar and contacts sources."
+msgstr "Eit tillegg for å setja opp Hula-kalenderkjelder."
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
 msgstr "GroupWise-kontooppsett"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/install-shared.c:219
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:224
+#, fuzzy
+msgid "Install the shared folder"
+msgstr "Endra namn på den valde mappa"
+
+#: ../plugins/groupwise-features/install-shared.c:226
+#, fuzzy
+msgid "Shared Folder Installation"
+msgstr "Melding om delt mappe"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
 msgstr "Skrotinnstillingar"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Skrotpostinnstillingar</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Skrotpostinnstillingar"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
 msgstr "Junk Mail Settings..."
 
@@ -15948,10 +16737,6 @@ msgstr "<b>Skrotliste:</b>"
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "Skrotpostinnstillingar"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -15999,33 +16784,36 @@ msgstr "Mellombels godkjenning"
 msgid "<b>Users:</b>"
 msgstr "<b>Brukarar:</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "_Tilpass varsel"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontaktar ..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "Melding"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Melding om delt mappe"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Deltakarane vil få denne meldinga.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontaktar..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "_Tilpass varsel"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Ikkje delt"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With ..."
+#, fuzzy
+msgid "_Shared With..."
 msgstr "_Delt med..."
 
 #: ../plugins/groupwise-features/properties.glade.h:15
@@ -16069,14 +16857,15 @@ msgid "Subscribe to my _notifications"
 msgstr "_Abonnér på mine _varsel"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Les"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 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
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "Nekta tilgang"
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "Mellomtenar"
@@ -16090,7 +16879,7 @@ msgid "Proxy Login"
 msgstr "Mellomtenarinnlogging"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy-login.c:262
 #: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
@@ -16100,35 +16889,107 @@ msgstr "%sSkriv passordet til %s (brukar %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:517
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "_Mellomtenarinnlogging"
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:701
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Mellomtenar-fana vil berre vera tilgjengeleg når kontoen er tilkopla."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:706
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Mellomtenar-fana vil berre vera tilgjengeleg når kontoen er slått på."
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Users"
 msgstr "Brukarar"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr "Skriv inn brukarar og sett tilgjenge"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr "Ny _delt mappe..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Deling"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/share-folder.c:766
+#, fuzzy
+msgid "Add   "
+msgstr "_Legg til:"
+
+#: ../plugins/groupwise-features/share-folder.c:772
+#, fuzzy
+msgid "Modify"
+msgstr "Endra"
+
+#: ../plugins/groupwise-features/status-track.c:105
+#, fuzzy
+msgid "Message Status"
+msgstr "Spor meldingsstatus..."
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:119
+#, fuzzy
+msgid "Subject:"
+msgstr "_Emne:"
+
+#: ../plugins/groupwise-features/status-track.c:133
+#, fuzzy
+msgid "From:"
+msgstr "_Frå:"
+
+#: ../plugins/groupwise-features/status-track.c:148
+#, fuzzy
+msgid "Creation date:"
+msgstr "Fullføringsdato"
+
+#: ../plugins/groupwise-features/status-track.c:187
+#, fuzzy
+msgid "Recipient: "
+msgstr "Mottakarar"
+
+#: ../plugins/groupwise-features/status-track.c:194
+#, fuzzy
+msgid "Delivered: "
+msgstr "_Levert"
+
+#: ../plugins/groupwise-features/status-track.c:200
+#, fuzzy
+msgid "Opened: "
+msgstr "Opna"
+
+#: ../plugins/groupwise-features/status-track.c:205
+#, fuzzy
+msgid "Accepted: "
+msgstr "Akseptert"
+
+#: ../plugins/groupwise-features/status-track.c:210
+#, fuzzy
+msgid "Deleted: "
+msgstr "Sletta"
+
+#: ../plugins/groupwise-features/status-track.c:215
+#, fuzzy
+msgid "Declined: "
+msgstr "Avslått"
+
+#: ../plugins/groupwise-features/status-track.c:220
+#, fuzzy
+msgid "Completed: "
+msgstr "Ferdig "
+
+#: ../plugins/groupwise-features/status-track.c:225
+#, fuzzy
+msgid "Undelivered: "
+msgstr "_Levert"
+
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "Spor meldingsstatus..."
 
@@ -16140,38 +17001,127 @@ msgstr "Eit tillegg for å setja opp Hula-kalenderkjelder."
 msgid "Hula Account Setup"
 msgstr "Hula-kontooppsett"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/imap-features/imap-headers.c:322
+#, fuzzy
+msgid "Custom Headers"
+msgstr "Sjølvvalt _melding"
+
+#: ../plugins/imap-features/imap-headers.c:335
+#, fuzzy
+msgid "IMAP Headers"
+msgstr "Meldingshovud"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+#, fuzzy
+msgid "<b>Custom Headers</b>"
+msgstr "<b>Brukarar:</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+#, fuzzy
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>D_eltakarar</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+#, fuzzy
+msgid "Fetch A_ll Headers"
+msgstr "Fullt hovud"
+
+#: ../plugins/imap-features/imap-headers.glade.h:5
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:7
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:9
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin for the features in the IMAP accounts."
+msgstr "Eit tillegg for funksjonar i GroupWise-kontoar."
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Calendar"
 msgstr "_Importer til kalender"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:87
 msgid "_Import to Tasks"
 msgstr "_Importer til oppgåver"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:198
+#: ../plugins/import-ics-attachments/icsimporter.c:205
 msgid "Import ICS"
 msgstr "Importer ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:226
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Task List"
 msgstr "Vel oppgåveliste"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:230
+#: ../plugins/import-ics-attachments/icsimporter.c:232
 msgid "Select Calendar"
 msgstr "Vel kalender"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:263
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importér"
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+#, fuzzy
+msgid "Import to Calendar"
+msgstr "_Importer til kalender"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+#, fuzzy
+msgid "Imports ICS attachments to calendar."
+msgstr "Eit vedlegg å leggja ved."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+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 ""
+
+#: ../plugins/ipod-sync/ical-format.c:133
+#: ../plugins/save-calendar/ical-format.c:190
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+#, fuzzy
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
 msgstr "Synkroniser den valde oppgåva/kalenderen/adresseboka med Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -16182,138 +17132,133 @@ msgstr "_Synkroniser med iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronisering"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "Inga ut-mappe!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr ""
-"Fann inga ut-mappe på iPod. Kontroller at iPoden er stilt inn rett og prøv "
-"igjen."
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "Klarte ikkje å eksportera data."
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "Klarte ikkje å eksportera data."
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "Klarte ikkje å opna adressebok."
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "Klarte ikkje å opna Evolution-adresseboka for å eksportera data."
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "Klarte ikkje å opna kalendar/oppgåveliste."
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "Klarte ikkje å opna kalendar/oppgåveliste for å eksportera data."
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Klarte ikkje å lasta kalenderen «%s»."
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:589
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein avtale i kalenderen «%s» kolliderer med dette møtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:615
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fann avtalen i kalenderen «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:691
 msgid "Unable to find any calendars"
 msgstr "Klarte ikkje å finna nokon kalenderar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:698
 msgid "Unable to find this meeting in any calendar"
 msgstr "Fann ikkje møtet i nokon kalenderar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:702
 msgid "Unable to find this task in any task list"
 msgstr "Fann ikkje oppgåva i nokon oppgåvelister"
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "Klarte ikkje å finna denne journaloppføringa i nokon journalar"
+#: ../plugins/itip-formatter/itip-formatter.c:706
+#, fuzzy
+msgid "Unable to find this memo in any memo list"
+msgstr "Fann ikkje oppgåva i nokon oppgåvelister"
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter ein eksisterande versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:943
 msgid "Unable to parse item"
 msgstr "Klarte ikkje å tolka element"
 
-#: ../plugins/itip-formatter/itip-formatter.c:857
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan ikkje senda oppføring til kalenderen «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:1013
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som akseptert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:872
+#: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:877
+#: ../plugins/itip-formatter/itip-formatter.c:1022
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:882
+#: ../plugins/itip-formatter/itip-formatter.c:1027
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:975
+#: ../plugins/itip-formatter/itip-formatter.c:1121
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatoren har fjerna delegaten %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:982
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sendte eit avlysingsvarsel til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:984
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Klarte ikkje å senda avlysingsvarselet til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1069
+#: ../plugins/itip-formatter/itip-formatter.c:1216
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakarstatusen kan ikkje oppdaterast fordi han er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1243
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikkje oppdatere deltakar. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1247
 msgid "Attendee status updated"
 msgstr "Deltakarstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1273
+#, fuzzy
+msgid "Meeting information sent"
+msgstr "Møteinformasjon"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1276
+#, fuzzy
+msgid "Task information sent"
+msgstr "Informasjon om oppgåve"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+#, fuzzy
+msgid "Memo information sent"
+msgstr "Ingen informasjon"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1288
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1291
+#, fuzzy
+msgid "Unable to send task information, the task does not exist"
+msgstr "Fann ikkje oppgåva i nokon oppgåvelister"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1294
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "The calendar attached is not valid"
 msgstr "Kalenderen som er lagt ved er ikkje gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1228
+#: ../plugins/itip-formatter/itip-formatter.c:1370
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16321,15 +17266,15 @@ msgstr ""
 "Meldinga seier ho inneheld ein kalender, men kalenderen er ikkje ein gyldig "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
-#: ../plugins/itip-formatter/itip-formatter.c:1281
-#: ../plugins/itip-formatter/itip-formatter.c:1359
+#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringa i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
-#: ../plugins/itip-formatter/itip-formatter.c:1282
-#: ../plugins/itip-formatter/itip-formatter.c:1360
+#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1439
+#: ../plugins/itip-formatter/itip-formatter.c:1521
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16337,432 +17282,509 @@ msgstr ""
 "Meldinga inneheld ein kalender, men kalenderen inneheld ingen hendingar, "
 "oppgåver eller ledig/oppteken-informasjon."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "The calendar attached contains multiple items"
 msgstr "Kalenderen som er lagt ved inneheld fleire oppføringar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 "For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2148
+#, fuzzy
+msgid "This meeting recurs"
+msgstr "_Denne avtalen gjentek seg"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2151
+#, fuzzy
+msgid "This task recurs"
+msgstr "_Denne avtalen gjentek seg"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2154
+#, fuzzy
+msgid "This memo recurs"
+msgstr "_Denne avtalen gjentek seg"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:2369
 msgid "_Delete message after acting"
 msgstr "_Slett meldinga etter handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2077
-#: ../plugins/itip-formatter/itip-formatter.c:2109
+#: ../plugins/itip-formatter/itip-formatter.c:2379
+#: ../plugins/itip-formatter/itip-formatter.c:2411
 msgid "Conflict Search"
 msgstr "Konfliktsøk"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../plugins/itip-formatter/itip-formatter.c:2394
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vel kalendrar å søkje i etter møtekonfliktar"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M"
 msgstr "I dag, %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:201
 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:206
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Today %l:%M:%S %p"
 msgstr "I dag, %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow"
 msgstr "I morgon"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M"
 msgstr "I morgon %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgon %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgon, %l.%M.%p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:238
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgon, %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:257
 #, 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:258
+#: ../plugins/itip-formatter/itip-view.c:262
 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:262
+#: ../plugins/itip-formatter/itip-view.c:266
 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:267
+#: ../plugins/itip-formatter/itip-view.c:271
 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:271
+#: ../plugins/itip-formatter/itip-view.c:275
 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:280
+#: ../plugins/itip-formatter/itip-view.c:284
 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:286
+#: ../plugins/itip-formatter/itip-view.c:290
 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:290
+#: ../plugins/itip-formatter/itip-view.c:294
 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:295
+#: ../plugins/itip-formatter/itip-view.c:299
 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:299
+#: ../plugins/itip-formatter/itip-view.c:303
 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:305
+#: ../plugins/itip-formatter/itip-view.c:309
 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:310
+#: ../plugins/itip-formatter/itip-view.c:314
 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:314
+#: ../plugins/itip-formatter/itip-view.c:318
 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:319
+#: ../plugins/itip-formatter/itip-view.c:323
 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:323
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e. %B %Y, %H.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> gjennom %s har publisert møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publisert møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> har delegert dette møtet til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> gjennom %s vil ha deg til å stille i møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> vil ha deg til å stille i møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> gjennom %s ber om å leggja til eit eksisterande møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ber om å leggja til eit eksisterande møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:383
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen om:"
+
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen om:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:389
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> har sendt et svar om møtet:"
+
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> har sendt et svar om møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> gjennom %s har avlyst dette møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> har avlyst dette møtet:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:401
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> har forespurt møteenrdingar:"
+
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> har forespurt møteenrdingar:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> gjennom %s har forespurt møteendringar:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> har avslått møteendringane:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> gjennom %s har publisert oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> har publisert oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> ber om at %s er med på oppgåva:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> gjennom %s har lagt deg til ei oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> har lagt deg til ei oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> gjennom %s ynskjer å leggja til ei eksisterande oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ynskjer å leggja til ei eksisterande oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:471
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen om:"
+
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen om:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:477
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> har sendt tilbake eit svar til ei tildelt oppgåve:"
+
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> har sendt tilbake eit svar til ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> gjennom %s har avlyst ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> har avlyst ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:489
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> har føreslått endringar i oppgåvetildeling:"
+
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> har føreslått endringar i oppgåvetildeling:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> gjennom %s har avslått tilordna oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslått ei tildelt oppgåve:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> gjennom %s har publisert dette notatet:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> har publisert dette notatet:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> gjennom %s ber om å leggja til i eit eksisterande notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ber om å leggja til i eit eksisterande notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> gjennom %s har kansellert dette delte notatet:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har kansellert dette delte notatet:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:821
 msgid "_Open Calendar"
 msgstr "_Opna kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Decline"
 msgstr "_Avslå"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Accept"
 msgstr "_Godta"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Decline all"
 msgstr "_Avslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Tentative all"
 msgstr "_Tentativt alle"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Tentative"
 msgstr "_Tentativt"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Accept all"
 msgstr "_Godta alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update Attendee Status"
 msgstr "_Oppdater deltakarstatus"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update"
 msgstr "_Oppdater"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Byrjar:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Sluttar:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Merknad:"
 
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
+#: ../plugins/itip-formatter/itip-view.c:1073
+#, fuzzy
+msgid "Send _reply to sender"
+msgstr "Sva_r til avsendar"
+
+#: ../plugins/itip-formatter/itip-view.c:1101
+#, fuzzy
+msgid "Send _updates to attendees"
 msgstr "Send oppdateringar til deltakarar"
 
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1110
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "_Bruk på alle instansane"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1119
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Vis tida som _oppteken"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Oppgåver:"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Notat:"
 
@@ -16803,34 +17825,165 @@ msgstr "Tillet deaktivering av kontoar."
 msgid "Disable Account"
 msgstr "Deaktiver konto"
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "Vel lydfil"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Lagar ei D_BUS-melding når ein ny e-post kjem."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Spel lydfil når det _kjem ny e-post"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#, fuzzy
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Få leveringskvittering når meldinga vert lesen"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#, fuzzy
+msgid "Sound file name to be played."
+msgstr "Filnamn ikkje oppgjeve."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Lydfil å spela når det kjem ny e-post."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#, fuzzy
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Spel lydfil når det _kjem ny e-post"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#, fuzzy
+msgid "Whether the icon should blink or not."
+msgstr "Om sidestolpen skal vera synleg."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:254
+#, fuzzy
+msgid "Generate a _D-Bus message"
+msgstr "Opprettar meldingsliste"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
 #, c-format
-msgid "System error: %s"
-msgstr "Systemfeil: %s"
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../plugins/mail-remote/client.c:32
+#: ../plugins/mail-notification/mail-notification.c:368
 #, c-format
-msgid "Camel error: %s"
-msgstr "Kamelfeil: %s"
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:380
+#: ../plugins/mail-notification/mail-notification.c:385
+#, fuzzy
+msgid "New email"
+msgstr "Nytt notat"
+
+#: ../plugins/mail-notification/mail-notification.c:440
+#, fuzzy
+msgid "Show icon in _notification area"
+msgstr "Vis varslingar i varslingstrau"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Kontoen kan ikkje senda e-post"
+#: ../plugins/mail-notification/mail-notification.c:443
+#, fuzzy
+msgid "B_link icon in notification area"
+msgstr "_Tilpass varsel"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "Inga lagringsplass tilgjengeleg"
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
+msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/mail-notification.c:626
+#, fuzzy
+msgid "_Play sound when new messages arrive"
+msgstr "Spel lydfil når det _kjem ny e-post"
+
+#: ../plugins/mail-notification/mail-notification.c:632
+#, fuzzy
+msgid "_Beep"
+msgstr "Pip"
+
+#: ../plugins/mail-notification/mail-notification.c:633
+#, fuzzy
+msgid "Play _sound file"
+msgstr "Vel lydfil"
+
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "Oppgje _filnamn:"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "Vel lydfil"
+
+#: ../plugins/mail-notification/mail-notification.c:646
+#, fuzzy
+msgid "Pl_ay"
+msgstr "Palau"
+
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
 msgstr ""
-"Eit tillegg som inneheld eit CORBA-grensesnitt for å aksessera e-post-data "
-"eksternt."
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "E-post eksternt"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Varsling om ny e-post"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16846,6 +17999,17 @@ msgstr "_Konverter til møte"
 msgid "Mail to meeting"
 msgstr "E-post til møte"
 
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Kan ikkje opna fila"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
@@ -16888,9 +18052,9 @@ msgid "Mailing _List"
 msgstr "E-post_liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+#, fuzzy
 msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Gjev handlingar for vanlege e-postliste-kommandoar (tinga, sei opp "
 "tinging, ...)."
@@ -17054,11 +18218,13 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "Markerer valt melding for visning fråkopla."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+#, fuzzy
+msgid "_Do not make available for offline use"
 msgstr "_Ikkje gjer denne tilgjengeleg fråkopla"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
+#, fuzzy
+msgid "_Make available for offline use"
 msgstr "_Markér kalenderen for bruk fråkopla"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
@@ -17069,18 +18235,6 @@ msgstr "Eit tillegg som gjer det mogleg å bruka mono-tillegg."
 msgid "Mono Loader"
 msgstr "Mono"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "Lagar ei D_BUS-melding når ein ny e-post kjem."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "Varsling om ny e-post"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Varsling om ny e-post"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr ""
@@ -17088,7 +18242,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:225
 msgid "Plugin Manager"
 msgstr "Hansamar for programtillegg"
 
@@ -17100,22 +18254,35 @@ msgstr "Slå av og på programtillegg"
 msgid "_Plugins"
 msgstr "_Programtillegg"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:57
 msgid "Author(s)"
 msgstr "Forfattar(ar)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Skildring"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Merk: Nokre endringar vil ikkje hende før programmet startes på nytt"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:260
+#, fuzzy
+msgid "Overview"
+msgstr "Sjå gjennom"
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+#, fuzzy
+msgid "Configuration"
+msgstr "Oppsett for post"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
 msgid "Plugin"
 msgstr "Programtillegg"
 
@@ -17140,26 +18307,32 @@ msgstr "Reintekstmodus"
 msgid "Prefer plain-text"
 msgstr "Føretrekk rein tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:139
 msgid "Show HTML if present"
 msgstr "Vis HTML når det finst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:140
 msgid "Prefer PLAIN"
 msgstr "Føretrekk PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:141
 msgid "Only ever show PLAIN"
 msgstr "Vis berre PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
+#: ../plugins/prefer-plain/prefer-plain.c:184
+#, fuzzy
+msgid "HTML _Mode"
 msgstr "HTML-modus"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
+#, fuzzy
+msgid "Gives an option to print from the composer."
 msgstr "Gjev eit val om å skriva ut frå redigeringa"
 
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "Skriv ut melding"
+
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
@@ -17195,7 +18368,13 @@ msgstr "Stader"
 msgid "_Publish Calendar Information"
 msgstr "Publiser kalenderinformasjon"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Skriv passordet til «%s»"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
 msgid "Are you sure you want to remove this URL?"
 msgstr "Er du sikker på at du vil fjerna denne adressa?"
 
@@ -17217,6 +18396,10 @@ msgstr ""
 "Kvar veke\n"
 "Manuelt (gjennom Handlingar-menyen)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "S_lå på"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "P_ort:"
@@ -17255,10 +18438,22 @@ msgstr "Teneste_type:"
 msgid "_File:"
 msgstr "_Fil:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Passord:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "_Publiser som:"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Hugs passordet"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "Br_ukarnamn:"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17267,49 +18462,68 @@ msgstr ""
 "iCal\n"
 "Ledig/oppteken"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#, fuzzy
+msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (innebygd)"
 
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+#, fuzzy
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "<small>Dette vil gjera filteret meir påliteleg, men tregare</small>"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+msgid "I_nclude remote tests"
+msgstr "Ta _med eksterne testar"
+
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+#, fuzzy
 msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
 msgstr ""
 "Filtrerer skrotpost med SpamAssassin. Dette tillegget krev at SpamAssassin "
 "er installert."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
+#, fuzzy
+msgid "SpamAssassin junk plugin"
 msgstr "Spamassassin skrottillegg"
 
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#, fuzzy
+msgid "Spamassassin Options"
+msgstr "Spamassassin (innebygd)"
+
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "Eit tillegg for å lagra alle vedlegg eller meldingsdelar på ein gong."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "Lagra vedlegg"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments ..."
+#, fuzzy
+msgid "Save Attachments..."
 msgstr "Lagra vedlegg ..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Lagra alle vedlegg"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
 msgid "Select save base name"
 msgstr "Vel felles lagringsnamn"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "Lagra"
 
@@ -17317,79 +18531,79 @@ msgstr "Lagra"
 #. * 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:171
+#: ../plugins/save-calendar/csv-format.c:167
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Description List"
 msgstr "Skildringsliste"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Categories List"
 msgstr "Kategoriliste"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Comment List"
 msgstr "Merknadsliste"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Created"
 msgstr "Laga"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "percent Done"
 msgstr "prosent ferdig"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "URL"
 msgstr "Adresse"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Attendees List"
 msgstr "Deltakarliste"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Modified"
 msgstr "Endra"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Advanced options for the CSV format"
 msgstr "Avanserte innstillingar for CSV-formatet"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Prepend a header"
 msgstr "Legg til eit hovud i starten"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:561
 msgid "Value delimiter:"
 msgstr "Skiljeteikn:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:567
 msgid "Record delimiter:"
 msgstr "Skiljeteikn:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "Encapsulate values with:"
 msgstr "Pakk inn verdiar med:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:595
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaskild verdiformat (.csv)"
 
@@ -17410,16 +18624,15 @@ msgstr "Lagra 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:158
+#: ../plugins/save-calendar/rdf-format.c:154
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:164
 msgid "Select destination file"
 msgstr "Vel målfil"
 
@@ -17436,6 +18649,11 @@ msgid "Show _only this Calendar"
 msgstr "Vis _berre denne kalenderen"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+#, fuzzy
+msgid "Show _only this Memo List"
+msgstr "Vis _berre denne oppgåvelista"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "Vis _berre denne oppgåvelista"
 
@@ -17447,15 +18665,15 @@ msgstr "Eit tillegg som handsamar oppstartsrettleiaren."
 msgid "Startup wizard"
 msgstr "Oppstartsvegvisar"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution oppsettassistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Velkomen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -17467,22 +18685,33 @@ msgstr ""
 "\n"
 "Klikk på «Framover» for å gå vidare. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:134
+#, fuzzy
+msgid "Importing files"
+msgstr "Importer ei ein_skild fil"
+
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil importere:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Frå %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:511
+#, c-format
 msgid "Importing data."
 msgstr "Importerer data."
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr "Vent litt"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "Viser om tråding av meldingar skal bruka emnefeltet."
@@ -17497,9 +18726,19 @@ msgstr "Sorter meldingslista i trådar etter emne"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#, fuzzy
+msgid "F_all back to threading messages by subject"
 msgstr "Bruk e_mnefeltet ved tråding når annan informasjon ikkje finst"
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+#, fuzzy
+msgid "TNEF Attachment decoder"
+msgstr "Inga vedlegg"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution skal"
@@ -17508,94 +18747,100 @@ msgstr "Evolution skal"
 msgid "Evolution Shell Config factory"
 msgstr "Evolution skal-oppsett"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution-test"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolution testkomponent"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+#, fuzzy
+msgid "A string description of the current printer settings."
 msgstr "Ei GNOMS Print-skildring av dei noverande skrivarinnstillingane"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "Oppsettversjon"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash detection should be run or not."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Standard breidde på sidefeltet"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Standard høgde på vindauget"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Standard vindaugetilstand"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Standard breidde på vindauget"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "ID eller alias til komponenten som vert vist som standard ved oppstart."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgraderte versjon av oppsettet"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stiar til mapper som skal synkroniserast til disk for fråkopla "
 "bruk"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Printer settings"
-msgstr "Skrivarinnstillingar"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Sidebar is visible"
 msgstr "Sidestolpen er synleg"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Om utviklarversjonsvindauget skal hoppast over"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+#, fuzzy
+msgid "Skip recovery warning dialog"
+msgstr "Om utviklarversjonsvindauget skal hoppast over"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
 msgid "Start in offline mode"
 msgstr "Start i fråkopla modus"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Statusbar is visible"
 msgstr "Statuslinja er synleg"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
 msgstr "Standardhøgde på hovudvindauget, i biletepunkt."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "The default width for the main window, in pixels."
 msgstr "Standardbreidde på hovudvindauget, i bildepunkt."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "The default width for the sidebar, in pixels."
 msgstr "Standard breidde på sidefeltet, i bildepunkt."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17603,7 +18848,7 @@ msgstr ""
 "Den sist oppgraderte oppsettsversjonen av Evolution, med stor/liten/"
 "oppsettnivå (t.d. «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17612,45 +18857,55 @@ msgstr ""
 "Stil på vindaugeknappane. Kan vera «text», «icons»,«both» eller «toolbar». "
 "Når «toolbar» er valt vert stilen styrt av GNOME si verktøylinjeinnstilling."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
 msgstr "Verktøylinja er synleg"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+#, fuzzy
+msgid "Whether crash detection should be done or not"
+msgstr "Om vindaugeknappane skal vera synlege."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether or not the window should be maximized."
 msgstr "Om vindauget skal vera maksimert."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidestolpen skal vera synleg."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinja skal vera synleg."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinja skal vera synleg."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Om åtvaringsvindauget utviklarversjonane av Evolution skal droppast."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+#, fuzzy
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr "Om åtvaringsvindauget utviklarversjonane av Evolution skal droppast."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the window buttons should be visible."
 msgstr "Om vindaugeknappane skal vera synlege."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Window button style"
 msgstr "Vindaugeknappstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Window buttons are visible"
 msgstr "Vindaugeknappane er synlege"
 
@@ -17666,16 +18921,11 @@ msgstr "Aktive tilkoplingar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å late att desse tilknytningane og for å kople av"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(Utan tittel)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Vel importerar som skal køyrast:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17689,11 +18939,11 @@ msgstr ""
 "Du kan velja «Automatisk» dersom du ikkje veit. Då vil Evolution prøva å "
 "finna ut kva slags fil det er sjølv."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Vel målet for denne importen"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17705,27 +18955,27 @@ msgstr ""
 "som kan importerast vart ikkje funne. Klikk på «Tilbake»-knappen\n"
 "dersom du vil prøva igjen.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:288
 msgid "F_ilename:"
 msgstr "F_ilnamn:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:293
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importér data _og innstillingar frå eldre program"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importer ei ein_skild fil"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Brukarval i Evolution"
 
@@ -17749,28 +18999,35 @@ msgstr "Mappenamn kan ikkje innehalda teiknet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er resverte mappenamn."
 
-#: ../shell/e-shell-window-commands.c:71
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#, fuzzy, c-format
+msgid "%s - Evolution"
+msgstr "Evolution"
+
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
-#: ../shell/e-shell-window-commands.c:79
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil ved køyring av %s."
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy er ikkje installert."
 
-#: ../shell/e-shell-window-commands.c:130
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kan ikkje køyrast."
 
 #. The translator-credits string is for translators to list
-#. * per language credits for translation, displayed in the
-#. * about box
-#: ../shell/e-shell-window-commands.c:561
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:663
 msgid "translator-credits"
 msgstr ""
 "Åsmund Skjæveland <aasmunds@fys.uio.no> 2003-2006\n"
@@ -17779,57 +19036,68 @@ msgstr ""
 "\n"
 "Send feilmeldingar og kommentarar til <i18n-nn@lister.ping.uio.no>"
 
-#: ../shell/e-shell-window-commands.c:806
+#: ../shell/e-shell-window-commands.c:674
+#, fuzzy
+msgid "Evolution Website"
+msgstr "Evolution-test"
+
+#: ../shell/e-shell-window-commands.c:692
+#, fuzzy
+msgid "Error opening the FAQ webpage."
+msgstr "Feil under opning av kalenderen"
+
+#: ../shell/e-shell-window-commands.c:889
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: ../shell/e-shell-window-commands.c:832
+#: ../shell/e-shell-window-commands.c:915
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: ../shell/e-shell-window.c:378
+#: ../shell/e-shell-window.c:382
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution held på å kopla frå."
 
-#: ../shell/e-shell-window.c:393
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
 
-#: ../shell/e-shell-window.c:793
+#: ../shell/e-shell-window.c:805
 #, c-format
 msgid "Switch to %s"
 msgstr "Byt til %s"
 
-#: ../shell/e-shell.c:634
-msgid "Uknown system error."
+#: ../shell/e-shell.c:640
+#, fuzzy
+msgid "Unknown system error."
 msgstr "Ukjend systemfeil."
 
-#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KiB"
 
-#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1282
 msgid "Invalid arguments"
 msgstr "Ugyldige argument"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1284
 msgid "Cannot register on OAF"
 msgstr "Kan ikkje registrera i OAF"
 
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1286
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
@@ -17839,15 +19107,15 @@ msgstr "Oppsettsdatabasen ikkje funnen"
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:107
 msgid "New Test"
 msgstr "Ny test"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:108
 msgid "_Test"
 msgstr "_Test"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Lag eit nytt testelement"
 
@@ -17890,7 +19158,7 @@ msgstr ""
 "med å importera filer frå andre program til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:228
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17927,7 +19195,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:252
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17935,39 +19203,66 @@ msgstr ""
 "Takk frå\n"
 "Evolution-laget\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:259
 msgid "Do not tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:309
+#, fuzzy
+msgid "Evolution Crash Detection"
+msgstr "Evolution informasjon"
+
+#: ../shell/main.c:311
+#, fuzzy
+msgid "Ig_nore"
+msgstr "Ignorer"
+
+#: ../shell/main.c:326
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+
+#: ../shell/main.c:337
+#, fuzzy
+msgid "_Do not show this message again"
+msgstr "Ikkje vis denne meldinga att."
+
+#: ../shell/main.c:569
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution, og start opp den oppgjevne delen"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:573
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:576
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:580
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tving ny migrering frå Evolution 1.4"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:583
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: ../shell/main.c:485
+#: ../shell/main.c:585
 msgid "Disable loading of any plugins."
 msgstr "Kopla frå lasting av tillegg."
 
-#: ../shell/main.c:516
+#: ../shell/main.c:587
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:617
 msgid "- The Evolution PIM and Email Client"
 msgstr "Evolution personleg informasjonshandsamar og e-postkomponent"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:630
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18140,49 +19435,63 @@ msgstr ""
 "sertifikatet, så trur du automatisk at dette sertifikatet ikkje er autentisk "
 "med mindre du seier noko anna her"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
 msgstr "Vel eit sertifikat å importera..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:146
+#, fuzzy
+msgid "All PKCS12 files"
+msgstr "PKCS12 filpassord"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+#, fuzzy
+msgid "All files"
+msgstr "Alle lokale mapper"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "Sertifikatnamn"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "Formål"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "Går ut"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:389
+#, fuzzy
+msgid "All email certificate files"
+msgstr "E-post-sertifiseringsinstans"
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
+#: ../smime/gui/certificate-manager.c:613
+#, fuzzy
+msgid "All CA certificate files"
+msgstr "Sertifikat-detaljar"
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatframvisar: %s"
 
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Skriv passordet til «%s»"
-
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -18399,7 +19708,7 @@ msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til sertifiseringsinstans"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:679
 msgid "Certificate already exists"
 msgstr "Sertifikatet finst frå før"
 
@@ -18578,30 +19887,6 @@ msgstr "Skriv inn passord til PKCS12-fil:"
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "Eit vedlegg å leggja ved."
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "Innhaldstypen til vedlegget."
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "Filnamnet som skal visast i e-posten."
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "Skildring av vedlegget."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "Be om at vedlegget til vanleg vert vist som ein del av meldinga."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "Standardemne for meldinga"
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -18725,6 +20010,10 @@ msgstr "Endra namn på den valde mappa"
 msgid "S_ave Address Book As VCard"
 msgstr "L_agra adresseboka som VCard"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Lagra som VCard ..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Lagra dei valde kontaktane som eit VCard."
@@ -18733,7 +20022,7 @@ msgstr "Lagra dei valde kontaktane som eit VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Lagra kontaktane i den valde mappa som eit VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
 msgid "Select All"
 msgstr "Vel alle"
 
@@ -18808,7 +20097,7 @@ msgstr "_Flytt kontakt til ..."
 msgid "_Move Folder Contacts To"
 msgstr "_Flytt mappekontaktar til"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
 msgid "_New"
 msgstr "_Ny"
 
@@ -19010,23 +20299,24 @@ msgstr "Lukk"
 msgid "I_nsert"
 msgstr "Set _inn"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "_Vedlegg ..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fil"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -19083,87 +20373,92 @@ msgid "R_ole Field"
 msgstr "R_ollefelt"
 
 #: ../ui/evolution-event-editor.xml.h:16
+#, fuzzy
+msgid "Send _Options"
+msgstr "Sendingsval"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "Vis tida som _oppteken"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Avgjer om deltakartypefeltet vert vist"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Avgjer om be-om-svar-feltet vert vist"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Avgjer om rollefeltet vert vist"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Avgjer om statusfeltet vert vist"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Avgjer om tidssonen vert vist"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Avgjer om kategoriar vert viste"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "Avgjer om denne hendinga varer heile dagen"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "Avgjer om tida skal visast som oppteken"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "_Alarmar"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Kategoriar"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "_Klassifisering"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "_Ledig/Oppteken"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_SU"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "_Repetering"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "_Statusfelt"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "_Typefelt"
 
@@ -19188,79 +20483,96 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Lag eller rediger reglar for filtrering av ny e-post"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Tøm _papirkorga"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "M_apper"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valt mappe til ei anna mappe"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle sletta meldingar frå alle mapper"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Søkjemapper"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "_Førehandsframsyning av melding"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "Vis førehandsframsyning av meldinga under meldingslista"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
 msgstr "Vis førehandsframsyning av meldinga attmed meldingslista"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "Vis meldings-førehandsframsyningsvindauge"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonnér eller fjern abonnement på mapper på eksterne tenarar"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Klassisk utsjånad"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "_Vevlogg:"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "_Meldingsfilter"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "_Flytt mappe til..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "_Førehandsframsyning"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "_Abonnement"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "Loddrett utsjånad"
 
@@ -19323,62 +20635,87 @@ msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldingane som lesne"
 
 #: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
+msgid "Mark all messages in the folder as read"
+msgstr "Merka alle meldingar som lesne?"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(ar) frå utklippstavla"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle sletta meldingar frå denne mappa for godt"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappa for godt"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
+#, fuzzy
+msgid "Re_fresh..."
+msgstr "Oppdater"
+
+#: ../ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Refresh the folder"
+msgstr "Friskar opp mappe"
+
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "Vel meldings_tråd"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "Vel meldings_tråd"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "Vel _alle meldingar"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Vel alle og berre dei meldingane som ikkje alt er merka"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Vel alle meldingane i same tråd som den valde meldinga"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "Vel alle meldingane i same tråd som den valde meldinga"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Vel alle synlege meldingar"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "_Vis gøymde meldingar"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Vis meldingar som har vore mellombels gøymd"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Mellombels gøym alle lesne meldingar"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Mellombels gøym dei valde meldingane"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Tråda meldingsliste"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "_Grupper etter trådar"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Melding"
@@ -19681,7 +21018,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "Søkjemappe frå e-postliste..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
+#, fuzzy
+msgid "Search Folder from Recipien_ts..."
 msgstr "Søkjemappe frå _mottakarar..."
 
 #: ../ui/evolution-mail-message.xml.h:88
@@ -19704,7 +21042,7 @@ msgstr "Merk _all tekst"
 msgid "Select all the text in a message"
 msgstr "Vel alle tekst i ei melding"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Endra sideoppsettet til den valde skrivaren"
 
@@ -19808,23 +21146,28 @@ msgstr "_Førre melding"
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "_Les"
+
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Save Message..."
 msgstr "_Lagra melding..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Unread"
 msgstr "_Ulesen"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom"
 msgstr "Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
 msgid "_Zoom In"
 msgstr "Zoom _inn"
 
@@ -19832,7 +21175,7 @@ msgstr "Zoom _inn"
 msgid "Close this window"
 msgstr "Lukk vindauge"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hovudverktøylinje"
 
@@ -19907,152 +21250,187 @@ msgstr "Få leveringskvittering når meldinga vert lesen"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:12
+#, fuzzy
+msgid "Insert Send options"
+msgstr "Sett inn avanserte sendingsval"
+
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Opna ei fil"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP-kryptér"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP-signér"
 
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "PGP _Encrypt"
+msgstr "PGP-kryptér"
+
+#: ../ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "PGP _Sign"
+msgstr "PGP-signér"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "Sp_ør etter kvitteringar for lesne meldingar"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "S/MIME En_crypt"
+msgstr "S/MIME-kryptér"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME-kryptér"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "S/MIME Sig_n"
+msgstr "S/MIME-signér"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME-signér"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "S_end"
+msgstr "Send"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "Lagra som"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "Lagra kladd"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "L_agra som ..."
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "Lagra _kladd"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "Lagra  som kladd"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "Lagra i mappe ..."
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "Lagra aktiv fil"
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "Lagra fila med eit anna namn"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "Lagra meldinga i spesifisert mappe"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "Send"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Send meldinga i HTML-format"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "Send meldinga"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioriteten høg"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldinga med din PGP-nøkkel"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signér denne meldinga med S/MIME-signatursertifikatet ditt"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Avgjer om BCC-feltet vert vist"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "Avgjer om CC-feltet vert vist"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Avgjer om Frå-veljaren vert vist"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Avgjer om Post-til-feltet vert vist"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Avgjer om Svar-til-feltet vert vist"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "Avgjer om To-feltet vert vist"
 
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "S_lett alle"
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "_Frå-felt"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "_Opna ..."
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "_Svar-til-felt"
 
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "_Tryggleik"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:61
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "_Sendingsval"
+
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "_Til-felt"
 
@@ -20119,10 +21497,6 @@ msgstr "Statusdetaljar"
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Sendingsval"
-
 #: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
 msgstr "_Statusdetaljar"
@@ -20213,81 +21587,92 @@ msgid "Display window buttons with text only"
 msgstr "Vis vindaugeknappane berre med tekst"
 
 #: ../ui/evolution.xml.h:10
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Fjernar passorda frå minnet, slik at du vil bli spurd om dei på nytt"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "Gøym vindaugeknappar"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "_Importér ..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+#, fuzzy
+msgid "Icons _and Text"
 msgstr "Ikon _og tekst"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Importer data frå andre program"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "_Nytt vindauge"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
+
+#: ../ui/evolution.xml.h:21
+#, fuzzy
+msgid "Page Set_up..."
+msgstr "Sideoppsett"
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "E-post_innstillingar"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "Send / _Motta"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "Send køa meldingar og motta ny meldingar"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "Sett opp Pilot-oppsettet"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "Vis _sidestolpe"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "Vis _verktøylinje"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
@@ -20301,7 +21686,8 @@ msgid "Toggle whether we are working offline."
 msgstr "Vel om me arbeider fråkopla."
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
+#, fuzzy
+msgid "Tool_bar Style"
 msgstr "Verktøylinjestil"
 
 #: ../ui/evolution.xml.h:37
@@ -20324,35 +21710,42 @@ msgstr "_Lukk vindauge"
 msgid "_Forget Passwords"
 msgstr "_Gløym passord"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "_Høym knappar"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr ""
 
 #: ../ui/evolution.xml.h:46
-msgid "_Icons only"
+#, fuzzy
+msgid "_Hide Buttons"
+msgstr "_Høym knappar"
+
+#: ../ui/evolution.xml.h:47
+#, fuzzy
+msgid "_Icons Only"
 msgstr "Berre _ikon"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_Quick Reference"
 msgstr "_Snøggreferanse"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Switcher Appearance"
 msgstr "Ut_sjånad på vekslar"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Synchronization Options..."
 msgstr "_Synkroniseringsinnstillingar..."
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
+#: ../ui/evolution.xml.h:53
+#, fuzzy
+msgid "_Text Only"
 msgstr "_Rein tekst"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:55
 msgid "_Window"
 msgstr "_Vindauge"
 
@@ -20364,9 +21757,9 @@ msgstr "Etter _firma"
 msgid "_Address Cards"
 msgstr "_Adressekort"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Telefonliste"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "_Listeframsyning"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20376,10 +21769,6 @@ msgstr "V_ekesframsyning"
 msgid "_Day View"
 msgstr "_Dagsframsyning"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "_Listeframsyning"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Månadsframsyning"
@@ -20432,12 +21821,12 @@ msgstr "Med forfalls_dato"
 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:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
 msgid "UTC"
 msgstr "UTC"
 
@@ -20467,19 +21856,19 @@ msgstr ""
 "tidssone.\n"
 "Bruk høgre museknapp for å forminska."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Samling"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definer framsyningar for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Definer framsyningar"
 
@@ -20488,22 +21877,18 @@ msgstr "Definer framsyningar"
 msgid "Define Views for \"%s\""
 msgstr "Definer framsyningar for «%s»"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "R_edigér..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1927
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
 msgid "Instance"
 msgstr "Instans"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
 msgid "Save Current View"
 msgstr "Lagra aktiv framsyning"
 
@@ -20516,17 +21901,17 @@ msgid "_Replace existing view"
 msgstr "_Erstatt gjeldande framsyning"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "Tilpassa framsyning"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "Lagra sjølvvalt framsyning"
 
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "Definer framsyningar ..."
 
@@ -20534,15 +21919,34 @@ msgstr "Definer framsyningar ..."
 msgid "C_urrent View"
 msgstr "_Noverande framsyning"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, fuzzy, c-format
+msgid "Select View: %s"
+msgstr "Vekesframsyning: %s. %s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Lagra tilpassa framsyning ..."
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:369
+#, fuzzy
+msgid "Save current custom view"
+msgstr "Lagra aktiv framsyning"
+
+#: ../widgets/menus/gal-view-menus.c:383
+#, fuzzy
+msgid "Create or edit views"
+msgstr "_Lag ei ny framsyning"
+
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "Fabrikk"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "Definer ny framsyning"
 
@@ -20558,19 +21962,40 @@ msgstr "Type framsyning"
 msgid "Type of view:"
 msgstr "Type framsyning:"
 
+#: ../widgets/misc/e-attachment-bar.c:1028
+msgid "Attachment Bar"
+msgstr "Vedleggslinje"
+
+#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
+#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Kan ikkje leggja ved fila «%s»: %s"
+
+#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Kan ikkje leggja ved fila «%s»: Ikkje ei vanleg fil"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Vedleggseigenskapar"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Filnamn:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME-type:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk framsyning av vedlegget"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MTOTFLS"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1747
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1726
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20578,215 +22003,209 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Månadskalender"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
 msgid "Fill color"
 msgstr "Fyllfarge"
 
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
 msgid "GDK fill color"
 msgstr "GDK-fyllfarge"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
 msgid "Fill stipple"
 msgstr "Fyllstipling"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum width"
 msgstr "Minste breidd"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3016
+#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3072
 msgid "Minimum Width"
 msgstr "Minste breidde"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "No"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Tida må vera på format: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må vera mellom 0 og 100, inklusive"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "Sentraleuropeisk"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "Vesteuropeisk"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "Vesteuropeisk, ny"
 
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
-#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Simplified"
 msgstr "Forenkla"
 
-#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../widgets/misc/e-charset-picker.c:105
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../widgets/misc/e-charset-picker.c:174
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjend teiknsett: %s"
 
-#: ../widgets/misc/e-charset-picker.c:219
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "Teiknkoding"
 
-#: ../widgets/misc/e-charset-picker.c:234
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "Oppgi teiknsett"
 
-#: ../widgets/misc/e-charset-picker.c:341
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "Andre ..."
 
-#: ../widgets/misc/e-charset-picker.c:482
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "_Teiknkoding"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
 msgid "Text entry to input date"
 msgstr "Tekstfelt til å skriva dato i"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å visa ein kalender"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
 msgid "Combo box to select time"
 msgstr "Kombinasjonsboks til å velja tid med"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "Tid"
-
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:484
 msgid "No_w"
 msgstr "_No"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:490
 msgid "_Today"
 msgstr "_I dag"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../widgets/misc/e-dateedit.c:1655
+#, fuzzy
+msgid "Invalid Date Value"
+msgstr "Ugyldig signatur"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: ../widgets/misc/e-dateedit.c:1684
+#, fuzzy
+msgid "Invalid Time Value"
+msgstr "Ugyldig signatur"
 
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
@@ -20824,11 +22243,11 @@ msgstr "Merkelapp-skjermelement"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Eit skjermelement å visa i staden for den vanlege utvidarmerkelappen"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
 msgid "Expander Size"
 msgstr "Storleik på utvidar"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
 msgid "Size of the expander arrow"
 msgstr "Storleiken på utvidarpil"
 
@@ -20841,60 +22260,61 @@ msgid "Spacing around expander arrow"
 msgstr "Plass rundt utvidarpila"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:168
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:216
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "Lagra søk"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "Søk"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "_Lagra søk ..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "Redigér lagra søk ..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "_Avansert søk..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "Alle kontoane"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "Denne mappa"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "Denne meldinga"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
 msgid "Choose Image"
 msgstr "Vel bilete"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:626
 msgid "World Map"
 msgstr "Verdskart"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:628
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -20914,77 +22334,88 @@ msgstr "Synkroniser private postar:"
 msgid "Sync Categories:"
 msgstr "Synkroniser kategoriar:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "Tom melding"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "Omflytmodell"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "Kolonnebreidd"
 
-#: ../widgets/misc/e-search-bar.c:573
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+#, fuzzy
+msgid "Search"
+msgstr "_Søk"
+
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+#, fuzzy
+msgid "Click here to change the search type"
+msgstr "Klikk her for å leggja ved ei fil"
+
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:579
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:831
+#: ../widgets/misc/e-search-bar.c:872
 msgid "Item ID"
 msgstr "Element-ID"
 
-#: ../widgets/misc/e-search-bar.c:838 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-text.c:3565
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:971
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "_Vis: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:988
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "_Søk: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1000
+#: ../widgets/misc/e-search-bar.c:1042
 msgid " i_n "
 msgstr " i "
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Markørrad"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Markørkolonne"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "Sortering"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "Merkingsmodus"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "Markørmodus"
 
@@ -21121,14 +22552,14 @@ msgid "_When opened:"
 msgstr "Når _opna:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:297
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% ferdig)"
@@ -21153,178 +22584,173 @@ msgstr "_Tilgjengelege kategoriar:"
 msgid "categories"
 msgstr "kategoriar"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "oppsprettliste"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%k:%M"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Valt kolonne"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Fokusert kolonne"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Ikkje valt kolonne"
 
-#: ../widgets/table/e-cell-text.c:1793
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Gjennomstreka kolonne"
 
-#: ../widgets/table/e-cell-text.c:1800
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Understreka kolonne"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Feit kolonne"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Fargekolonne"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Bakgrunnsfargekolonne"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- _Fjern"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "Tilstand"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(Stigande)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(Synkande)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "Ikkje sortert"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "Inga gruppering"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "Vis felt"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "Tilgjengelege felt"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "_Tilgjengelege felt"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Stigande"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "Fjern alt"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1593
+#, fuzzy
+msgid "Clear _All"
+msgstr "Fjern alt"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Synkande"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Grupper etter"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "Flytt _ned"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "Flytt _opp"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "_Vis desse felta i rekkefølgje:"
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Show _field in View"
+msgstr "Vis felt i framsyning"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "Vis felt"
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Show field i_n View"
+msgstr "Vis felt i framsyning"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.glade.h:14
+#, fuzzy
+msgid "Show field in _View"
 msgstr "Vis felt i framsyning"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "Sortering"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "Sorter etter"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "Deretter etter"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "_Legg til ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "_Felt som vert viste ..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "_Sortér..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Tilstand"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(Stigande)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(Synkande)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "Ikkje sortert"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "Inga gruppering"
-
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "Tilgjengelege felt"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "_Grupper etter..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "Vis felt i framsyning"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "_Vis desse felta i rekkefølgje:"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:635
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1892
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "_Sortér..."
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:634
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Dra-og-slepp-kode"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:642
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1906
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:641
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Fullt hovud"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "Legg til kolonne ..."
 
@@ -21354,321 +22780,303 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d element)"
 msgstr[1] "%s (%d element)"
 
+#: ../widgets/table/e-table-group-container.c:896
 #: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
 msgid "Alternating Row Colors"
 msgstr "Vekslande radfargar"
 
+#: ../widgets/table/e-table-group-container.c:903
 #: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
-#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
 msgid "Horizontal Draw Grid"
 msgstr "Vassrett teiknerutenett"
 
+#: ../widgets/table/e-table-group-container.c:910
 #: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
 msgid "Vertical Draw Grid"
 msgstr "Loddrett teiknerutenett"
 
+#: ../widgets/table/e-table-group-container.c:917
 #: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
 msgid "Draw focus"
 msgstr "Teiknefokus"
 
+#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
 msgid "Cursor mode"
 msgstr "Markørmodus"
 
+#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 msgid "Selection model"
 msgstr "Veljemodell"
 
+#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
-#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
 msgid "Length Threshold"
 msgstr "Lengdeterskel"
 
+#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
 msgid "Uniform row height"
 msgstr "Jamn radhøgde"
 
+#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "Frosen"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1491
-msgid "Sort Ascending"
+#: ../widgets/table/e-table-header-item.c:1472
+#, fuzzy
+msgid "Sort _Ascending"
 msgstr "Sorter stigande"
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Descending"
+#: ../widgets/table/e-table-header-item.c:1473
+#, fuzzy
+msgid "Sort _Descending"
 msgstr "Sorter synkande"
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Unsort"
+#: ../widgets/table/e-table-header-item.c:1474
+#, fuzzy
+msgid "_Unsort"
 msgstr "Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1495
-msgid "Group By This Field"
+#: ../widgets/table/e-table-header-item.c:1476
+#, fuzzy
+msgid "Group By This _Field"
 msgstr "Grupper etter dette feltet"
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By Box"
+#: ../widgets/table/e-table-header-item.c:1477
+#, fuzzy
+msgid "Group By _Box"
 msgstr "Grupper etter boks"
 
-#: ../widgets/table/e-table-header-item.c:1498
-msgid "Remove This Column"
+#: ../widgets/table/e-table-header-item.c:1479
+#, fuzzy
+msgid "Remove This _Column"
 msgstr "Fjern denne kolonna"
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Add a Column..."
+#: ../widgets/table/e-table-header-item.c:1480
+#, fuzzy
+msgid "Add a C_olumn..."
 msgstr "Legg til kolonne ..."
 
-#: ../widgets/table/e-table-header-item.c:1501
-msgid "Alignment"
+#: ../widgets/table/e-table-header-item.c:1482
+#, fuzzy
+msgid "A_lignment"
 msgstr "Justering"
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Best Fit"
+#: ../widgets/table/e-table-header-item.c:1483
+#, fuzzy
+msgid "B_est Fit"
 msgstr "Beste tilpassing"
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Format Columns..."
+#: ../widgets/table/e-table-header-item.c:1484
+#, fuzzy
+msgid "Format Column_s..."
 msgstr "Formater kolonner ..."
 
-#: ../widgets/table/e-table-header-item.c:1505
-msgid "Customize Current View..."
+#: ../widgets/table/e-table-header-item.c:1486
+#, fuzzy
+msgid "Custo_mize Current View..."
 msgstr "Tilpass gjeldande visning ..."
 
-#: ../widgets/table/e-table-header-item.c:1554
-msgid "Sort By"
+#: ../widgets/table/e-table-header-item.c:1542
+#, fuzzy
+msgid "_Sort By"
 msgstr "Sorter etter"
 
-#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-msgid "Fontset"
-msgstr "Skrifttypesett"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+#, fuzzy
+msgid "_Custom"
+msgstr "Tilpassa"
+
+#: ../widgets/table/e-table-header-item.c:1893
+#, fuzzy
+msgid "Font Description"
+msgstr "Hendingsskildring"
 
-#: ../widgets/table/e-table-header-item.c:1920
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Sorteringsinfo"
 
-#: ../widgets/table/e-table-header-item.c:1934
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Tre"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
 msgid "Table header"
 msgstr "Tabelloverskrift"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
 msgid "Table model"
 msgstr "Tabellmodell"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
 msgid "Cursor row"
 msgstr "Markørrad"
 
-#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
 msgid "Always search"
 msgstr "Alltid søk"
 
-#: ../widgets/table/e-table.c:3322
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "Bruk klikk for å leggja til"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "ETree table adapter"
 msgstr "ETree tabelltilpassar"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3349
 msgid "Retro Look"
 msgstr "Retro-utsjånad"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3350
 msgid "Draw lines and +/- expanders."
 msgstr "Teikn linjer og «+»- og «-»-utvidarar."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "Minikort-test"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Opphavsrett © 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "Dette skal testa minikort-lerret-elementet"
+#: ../widgets/text/e-text.c:2734
+msgid "Input Methods"
+msgstr "Inndatametodar"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
 msgid "Event Processor"
 msgstr "Hendingsprosessor"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-msgid "Font"
-msgstr "Skrifttype"
-
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-msgid "GDKFont"
-msgstr "Skrifttype"
-
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
-msgid "Justification"
-msgstr "Justering"
-
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
-msgid "Use ellipsis"
-msgstr "Bruk ellipse"
-
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
-msgid "Ellipsis"
-msgstr "Ellipse"
-
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
-msgid "Line wrap"
-msgstr "Linjebryting"
-
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
-msgid "Break characters"
-msgstr "Bryteteikn"
-
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
-msgid "Max lines"
-msgstr "Største tal på linjer"
-
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "Tillat linjeskift"
-
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
-msgid "Draw borders"
-msgstr "Teikn rammer"
-
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
-msgid "Draw background"
-msgstr "Teikn bakgrunn"
-
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
-msgid "Draw button"
-msgstr "Teikn knapp"
-
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
-msgid "Cursor position"
-msgstr "Markørplassering"
-
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
-msgid "Emulate label resize"
-msgstr "Emuler merkelapp-skalering"
-
-#: ../widgets/text/e-text.c:2739
-msgid "Input Methods"
-msgstr "Inndatametodar"
-
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
 msgid "Bold"
 msgstr "Feit"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
 msgid "Strikeout"
 msgstr "Gjennomstreka"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+msgid "Justification"
+msgstr "Justering"
+
+#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
 msgid "Clip Width"
 msgstr "Breidde på utklipp"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
 msgid "Clip Height"
 msgstr "Høgde på utklipp"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Clip"
 msgstr "Utklipp"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Fill clip rectangle"
 msgstr "Fylt utklippsrektangel"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "X Offset"
 msgstr "X-forskyving"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Y Offset"
 msgstr "Y-forskyving"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Text width"
 msgstr "Tekstbreidde"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Text height"
 msgstr "Teksthøgde"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+msgid "Use ellipsis"
+msgstr "Bruk ellipse"
+
+#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+msgid "Ellipsis"
+msgstr "Ellipse"
+
+#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+msgid "Line wrap"
+msgstr "Linjebryting"
+
+#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+msgid "Break characters"
+msgstr "Bryteteikn"
+
+#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+msgid "Max lines"
+msgstr "Største tal på linjer"
+
+#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+msgid "Draw borders"
+msgstr "Teikn rammer"
+
+#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+msgid "Allow newlines"
+msgstr "Tillat linjeskift"
+
+#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+msgid "Draw background"
+msgstr "Teikn bakgrunn"
+
+#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+msgid "Draw button"
+msgstr "Teikn knapp"
+
+#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+msgid "Cursor position"
+msgstr "Markørplassering"
+
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
 msgid "IM Context"
 msgstr "Inndatametode-kontekst"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
 msgid "Handle Popup"
 msgstr "Oppsprett med handtak"
author	Åsmund Skjæveland <aasmunds@ulrik.uio.no>	2008-03-03 07:27:47 +0800
committer	Åsmund Skjæveland <aasmunds@src.gnome.org>	2008-03-03 07:27:47 +0800
commit	0d8b515e44c6c09708527027b8fc847234e5bd2b (patch)
tree	a53a2dbc190ed1e19414687c8d11ab81f6ac0478 /po/nn.po
parent	a47b2e99b51ed8a3e46c31a2111ddd212d8bbcf4 (diff)
download	gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.gz gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.bz2 gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.lz gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.xz gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.tar.zst gsoc2013-evolution-0d8b515e44c6c09708527027b8fc847234e5bd2b.zip