Updated Norwegian (nynorsk) translation

svn path=/trunk/; revision=14515

2 files changed, 3074 insertions, 2862 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index d0d7e35205..317a7da18e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-30  Roy-Magne Mo <rmo@sunnmore.net>
+
+	* nn.po: Small update to Norwegian (nynorsk) translation.
+
 2001-10-30    <NotZed@Ximian.com>
 
 	* en_AU.po: Changed the weather to be something more appropriate
diff --git a/po/nn.po b/po/nn.po
index f5c9660ee4..1c2028aeee 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,17 +2,28 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 # Kjartan Maraas  <kmaraas@gnome.org>, 2001.
+# Roy-Magne Mo <rmo@sunnmore.net>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
-"PO-Revision-Date: 2000-09-07 20:17+02:00\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"POT-Creation-Date: 2001-10-31 01:43+0100\n"
+"PO-Revision-Date: 2000-10-31 20:17+02:00\n"
+"Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Øydelagd oppsettfil."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "mellombels feil i namneoppslag"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
@@ -22,522 +33,503 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "mellombels feil i namneoppslag"
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Namn"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
-msgstr "E-post 2"
+msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
-msgstr "Privat"
+msgstr "Primær"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:63
 #, fuzzy
 msgid "Prim"
 msgstr "Privat"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/widgets/e-addressbook-view.c:902
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
-msgstr "Namn på assistent"
+msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 #, fuzzy
 msgid "Bus"
 msgstr "Oppteke"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Comp"
 msgstr "Kopier"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
-msgstr "Organisasjon:"
+msgstr "Organisasjon"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
-msgstr ""
+msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
-msgstr "Mobil:"
+msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
-msgstr "Teikn"
+msgstr "Bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Firma-fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
-msgstr "Firma"
+msgstr "Firma 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:76
 #, fuzzy
 msgid "Bus 2"
 msgstr "Oppteke"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
-msgstr "Heim"
+msgstr "Heim 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:52
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1610
-#: addressbook/gui/widgets/e-addressbook-view.c:890
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
-msgstr "Tilfeldig"
+msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1611
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1637
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1638
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
-msgstr "Avdeling:"
+msgstr "Avdeling"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
-msgstr ""
+msgstr "Avd"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
-msgstr "K&ontor:"
+msgstr "Kontor"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
-msgstr "K&ontor:"
+msgstr "Av"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
-msgstr "Tittel:"
+msgstr "Tittel"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
-msgstr "&Yrke:"
+msgstr "Yrke"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
-msgstr ""
+msgstr "Yrke"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
-msgstr "Personsøkjar"
+msgstr "Sjef"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Måndag"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
-msgstr "Kallenamn:"
+msgstr "Kallenamn"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
-msgstr "Kallenamn:"
+msgstr "Kallenamn"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
-msgstr "Ingen"
+msgstr "Notat"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Skriv ut alle"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Merkedag"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
-msgstr "Start-dato:"
+msgstr "Fødselsdag"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
+#: addressbook/backend/ebook/e-card-simple.c:104
 #: calendar/gui/e-calendar-table.etspec.h:4
-#, fuzzy
 msgid "Categories"
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
-msgstr "Fullt namn"
+msgstr "Etternamn"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#: addressbook/backend/ebook/e-card.c:3712
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3714
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3719
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3733
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3744
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3751
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3752
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3804
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3807
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3844
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3857
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3865
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3866
 #, fuzzy
 msgid ""
 "\n"
@@ -554,25 +546,25 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3882
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4235
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "&Fleire spelarar"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4243
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Kort 1:"
@@ -581,94 +573,94 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1452
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
-msgstr "Kunne ikkje initiere Bonobo"
+msgstr "Kunne ikkje initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
-#, fuzzy
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
-msgstr "Skriftinnstillingar"
+msgstr "Søkjer ..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#, fuzzy
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
-msgstr "Avsluttar ..."
+msgstr "Lastar ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 #, fuzzy
 msgid "Connecting to LDAP server..."
 msgstr " Koplar til tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 #, fuzzy
 msgid "Unable to connect to LDAP server."
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 #, fuzzy
 msgid "Waiting for connection to LDAP server..."
 msgstr " Koplar til tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr " Koplar til tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "&Suspender ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:984
+#: calendar/conduits/todo/todo-conduit.c:692
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:985
+#: calendar/conduits/todo/todo-conduit.c:693
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -717,46 +709,46 @@ msgstr "Øydelagd oppsettfil."
 msgid "Factory for the sample Addressbook control"
 msgstr "Legg adresse til adresseboka"
 
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 #, fuzzy
 msgid "Contacts"
 msgstr "&Innhald ..."
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Tenar:"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:526
 #, fuzzy
 msgid "New _Contact"
 msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact List"
 msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:527
 #, fuzzy
 msgid "New Contact _List"
 msgstr "&Ny kontakt"
@@ -786,9 +778,8 @@ msgid "Addressbook Sources"
 msgstr "Kjelde:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#, fuzzy
 msgid "Advanced"
-msgstr "Legg til ..."
+msgstr "Avansert"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
 #, fuzzy
@@ -796,10 +787,9 @@ msgid "Base"
 msgstr "Lim inn"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
-#, fuzzy
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
-msgstr "KBasic"
+msgstr "Enkel"
 
 #: addressbook/gui/component/addressbook-config.glade.h:8
 #, fuzzy
@@ -807,9 +797,8 @@ msgid "De_lete"
 msgstr "Slett"
 
 #: addressbook/gui/component/addressbook-config.glade.h:9
-#, fuzzy
 msgid "Email Address:"
-msgstr "E-post-adresse:"
+msgstr "E-postadresse:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:10
 msgid ""
@@ -817,8 +806,9 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
 msgid "One"
-msgstr ""
+msgstr "Ein"
 
 #: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
@@ -883,21 +873,19 @@ msgstr "Små ikon"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:92 my-evolution/my-evolution.glade.h:21
-#, fuzzy
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
-msgstr "Legg til"
+msgstr "_Legg til"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
 #: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
-#, fuzzy
 msgid "_Edit"
-msgstr "Rediger"
+msgstr "_Rediger"
 
 #: addressbook/gui/component/addressbook-config.glade.h:26
 #, fuzzy
@@ -905,33 +893,38 @@ msgid "_My server requires authentication"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:27
-#, fuzzy
 msgid "_Port:"
-msgstr "Prioritet:"
+msgstr "_Port:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:28
 #, fuzzy
 msgid "_Server name:"
 msgstr "Lagra melding"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Kunne ikkje initiere Bonobo"
+
+#: addressbook/gui/component/addressbook-storage.c:167
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:468
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -939,7 +932,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:490
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -949,46 +942,45 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:550
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:762
 #, fuzzy
 msgid "Email contains"
 msgstr "Små ikon"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Kategoriar"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-#, fuzzy
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
-msgstr "Legg til ..."
+msgstr "Avansert ..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Kategoriar"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -1001,56 +993,56 @@ msgstr ""
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 #, fuzzy
 msgid "Select an Action"
 msgstr "Vel ikon"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, fuzzy, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Lagar eit nytt dokument"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:891
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "A&dressebok ..."
 
-#: addressbook/gui/component/e-address-popup.c:934
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:963
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1046
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "E-post-adresse:"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 #, fuzzy
 msgid "Disable Queries"
 msgstr "Skru av førehandsvising"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 #, fuzzy
 msgid "Enable Queries (Dangerous!)"
 msgstr "Skru på meldingar?"
@@ -1064,53 +1056,62 @@ msgstr "Gpilotd adressekomponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:772
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 #, fuzzy
 msgid "Remove All"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "&Send e-post"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 #, fuzzy
 msgid "Edit Contact List"
 msgstr "&Innhald ..."
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 #, fuzzy
 msgid "Unnamed Contact List"
 msgstr "Endra skrift"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "Endra skrift"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
-"Evolution is unable to get the addressbook local storage. This may have been "
-"caused by the evolution-addressbook component crashing. To help us better "
-"understand and ultimately resolve this problem, please send an e-mail to Jon "
-"Trowbridge <trow@ximian.com> with a detailed description of the "
-"circumstances under which this error occurred.  Thank you."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1181,13 +1182,13 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 #, fuzzy
 msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Detaljar"
 
@@ -1261,13 +1262,12 @@ msgstr "&Innhald ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
-#, fuzzy
 msgid "_Delete"
-msgstr "Slett"
+msgstr "_Slett"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
@@ -1343,16 +1343,16 @@ msgstr "Er du sikker på at du vil sletta denne klassen?"
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -1360,27 +1360,37 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 #, fuzzy
 msgid "Edit Full"
 msgstr "Rediger fil"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 #, fuzzy
 msgid "Full Name"
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post 2"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "er"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -1431,13 +1441,12 @@ msgid "Antigua And Barbuda"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
-#, fuzzy
 msgid "Argentina"
-msgstr "Retning"
+msgstr "Argentina"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:12
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:13
 msgid "Aruba"
@@ -1445,12 +1454,11 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:14
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:15
-#, fuzzy
 msgid "Austria"
-msgstr "August"
+msgstr "Austerrike"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:16
 msgid "Azerbaijan"
@@ -1478,8 +1486,9 @@ msgid "Belarus"
 msgstr "år"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:22
+#, fuzzy
 msgid "Belgium"
-msgstr ""
+msgstr "Belgia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:23
 #, fuzzy
@@ -1517,9 +1526,8 @@ msgid "Bouvet Island"
 msgstr "moderert"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:31
-#, fuzzy
 msgid "Brazil"
-msgstr "Send"
+msgstr "Brasil"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
@@ -1534,8 +1542,9 @@ msgid "Brunei Darussalam"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:35
+#, fuzzy
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:36
 msgid "Burkina Faso"
@@ -1554,9 +1563,8 @@ msgid "Cameroon"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:40
-#, fuzzy
 msgid "Canada"
-msgstr "Skriv ut alle"
+msgstr "Canada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:41
 msgid "Cape Verde"
@@ -1711,9 +1719,8 @@ msgid "Finland"
 msgstr "Finn ..."
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:77
-#, fuzzy
 msgid "France"
-msgstr "Avbryt"
+msgstr "Frankrike"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:78
 msgid "French Guiana"
@@ -1736,12 +1743,14 @@ msgid "Gambia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:83
+#, fuzzy
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#, fuzzy
 msgid "Germany"
-msgstr ""
+msgstr "Tyskland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:85
 msgid "Ghana"
@@ -1815,9 +1824,8 @@ msgid "Hong Kong"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:101
-#, fuzzy
 msgid "Hungary"
-msgstr "Sundag"
+msgstr "Ungarn"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:102
 msgid "Iceland"
@@ -1846,8 +1854,9 @@ msgid "Italy"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:108
+#, fuzzy
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:109
 #, fuzzy
@@ -2037,8 +2046,9 @@ msgid "New Caledonia"
 msgstr "&Ny kontakt"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
 msgid "New Zealand"
-msgstr ""
+msgstr "New Zealand"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:152
 msgid "Nicaragua"
@@ -2068,9 +2078,8 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:158
-#, fuzzy
 msgid "Norway"
-msgstr "&No"
+msgstr "Noreg"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:159
 msgid "Oman"
@@ -2116,14 +2125,12 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:169
-#, fuzzy
 msgid "Poland"
-msgstr "Finn ..."
+msgstr "Polen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:170
-#, fuzzy
 msgid "Portugal"
-msgstr "Ståande"
+msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:171
 msgid "Puerto Rico"
@@ -2212,8 +2219,9 @@ msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#, fuzzy
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:192
 msgid "Solomon Islands"
@@ -2225,17 +2233,17 @@ msgid "Somalia"
 msgstr "Normal"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#, fuzzy
 msgid "South Africa"
-msgstr ""
+msgstr "Sør-Afrika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:195
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:196
-#, fuzzy
 msgid "Spain"
-msgstr "og"
+msgstr "Spania"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:197
 msgid "Sri Lanka"
@@ -2269,13 +2277,13 @@ msgid "Swaziland"
 msgstr "Finn ..."
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:204
-#, fuzzy
 msgid "Sweden"
-msgstr "Send"
+msgstr "Sverige"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
 msgid "Switzerland"
-msgstr ""
+msgstr "Sveits"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:206
 #, fuzzy
@@ -2288,9 +2296,8 @@ msgid "Tajikistan"
 msgstr "Oppgåver"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:208
-#, fuzzy
 msgid "Thailand"
-msgstr "Finn ..."
+msgstr "Thailand"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:209
 #, fuzzy
@@ -2315,9 +2322,8 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:214
-#, fuzzy
 msgid "Turkey"
-msgstr "Tys"
+msgstr "Tyrkia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:215
 msgid "Turkmenistan"
@@ -2350,17 +2356,17 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#, fuzzy
 msgid "United Kingdom"
-msgstr ""
+msgstr "Storbritannia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:223
 msgid "United Republic Of Tanzania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#, fuzzy
 msgid "United States"
-msgstr "Ulest melding"
+msgstr "USA"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:225
 msgid "United States Minor Outlying Islands"
@@ -2402,8 +2408,9 @@ msgid "Yemen"
 msgstr "Send"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#, fuzzy
 msgid "Yugoslavia"
-msgstr ""
+msgstr "Jugoslavia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:235
 msgid "Zambia"
@@ -2533,9 +2540,8 @@ msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-#, fuzzy
 msgid "_Remove"
-msgstr "Fjern"
+msgstr "_Fjern"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
@@ -2543,7 +2549,7 @@ msgid "contact-list-editor"
 msgstr "Comment=X-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Comment=X-redigering"
@@ -2596,166 +2602,173 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Legg til ..."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Søk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 #, fuzzy
 msgid "No cards"
 msgstr "Starta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 #, fuzzy
 msgid "1 card"
 msgstr "Skriv ut alle"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "sekund"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
-#, fuzzy
 msgid "Open"
-msgstr "Opna ..."
+msgstr "Opne"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Smarte vedlegg"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Private meldingar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Feil ved lasting av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:971
 msgid "Success"
 msgstr "Vellukka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 #, fuzzy
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:999
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Card not found"
 msgstr "fann ikkje artikkel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #, fuzzy
 msgid "Card ID already exists"
 msgstr "Fila finst alt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Protocol not supported"
 msgstr ""
 "Protokollen er ikkje støtta\n"
 "%1"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Avbroten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Other error"
 msgstr "Intern feil!"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+#, fuzzy
+msgid "Do you want to save changes?"
+msgstr "I ferd med å senda e-post ..."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding list"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 #, fuzzy
 msgid "Error adding card"
 msgstr "Feil ved lasting av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #, fuzzy
 msgid "Error modifying list"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 #, fuzzy
 msgid "Error removing list"
 msgstr "Feil ved fjerning av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
@@ -2763,7 +2776,7 @@ msgstr "Feil ved fjerning av oppsett"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:399
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -2771,80 +2784,89 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:404
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "Trykk her for å leggja til ein ny virtuell vert."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Company Phone"
 msgstr "Hovudtelefon til firmaet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:185
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:187
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:316
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2893,9 +2915,8 @@ msgid "Fonts"
 msgstr "Skrifttypar"
 
 #: addressbook/printing/e-contact-print.glade.h:9
-#, fuzzy
 msgid "Footer:"
-msgstr "Botntekst"
+msgstr "Botntekst:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
@@ -2946,8 +2967,9 @@ msgid "Letter tabs on side"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:21
+#, fuzzy
 msgid "Margins"
-msgstr "Marger"
+msgstr "Margar"
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
@@ -3007,9 +3029,8 @@ msgid "Sections:"
 msgstr "Del:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
-#, fuzzy
 msgid "Shading"
-msgstr "Lagring"
+msgstr "Skuggelegging"
 
 #: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
@@ -3042,107 +3063,114 @@ msgstr "Breidd:"
 msgid "_Font..."
 msgstr "Skrifttype ..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.c:1111
 #, fuzzy
 msgid "Print cards"
 msgstr "Skriv ut alle"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 #, fuzzy
 msgid "Print card"
 msgstr "Skriv ut alle"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 #, fuzzy
 msgid "Print envelope"
 msgstr "Private meldingar"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
-msgstr "Høgd"
+msgstr "Høg"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1700
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
-msgstr "Normal"
+msgstr "Vanleg"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
-msgstr "Senk"
+msgstr "Låg"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:938
+#: calendar/conduits/todo/todo-conduit.c:647
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1078
+#: calendar/conduits/calendar/calendar-conduit.c:1081
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Øydelagd oppsettfil."
@@ -3155,49 +3183,29 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, fuzzy, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "Informasjon om deg og omsetjingslaget"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
-#, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
-msgid "Notification about your appointment"
-msgstr "&Endra avtale ..."
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr ""
+msgid "Starting:"
+msgstr "Innstillingar"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, c-format
-msgid "Notification about your task starting on %s"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, c-format
-msgid "Notification about your task ending on %s"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Slutt-tid:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
 #, fuzzy
-msgid "Notification about your task"
-msgstr "Påminning"
+msgid "Evolution Alarm"
+msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarm"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -3220,11 +3228,11 @@ msgstr "Låg grense (minutt):"
 msgid "_Edit appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3232,7 +3240,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3243,17 +3251,20 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:181
 #, fuzzy
-msgid "Could not initialize gnome-vfs"
-msgstr "Kunne ikkje initiere Bonobo"
+msgid "Could not create the alarm notify service"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:186
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr ""
@@ -3261,26 +3272,26 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:438
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%1 bit %2 %3"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:441 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:450
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:474 calendar/gui/calendar-commands.c:476
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%1 bit %2 %3"
@@ -3288,162 +3299,142 @@ msgstr "%1 bit %2 %3"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:466
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 #, fuzzy
 msgid "%d %B"
 msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:676
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:538
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
-#, fuzzy
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
-msgstr "Gresk"
+msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409 shell/evolution-shell-component.c:993
 msgid "Busy"
 msgstr "Oppteke"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
-msgstr "Starta"
+msgstr "Ikkje starta"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
-msgstr "Framgong:"
+msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Ferdig"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:916
-#, fuzzy, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr "Ein bandindeks må vera valt i treet."
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1702
 #, fuzzy
 msgid "Recurring"
 msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1704
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
-#: calendar/gui/e-meeting-model.c:702
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
+#, fuzzy
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
-#, fuzzy
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
-msgstr "&No"
+msgstr "Nei"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1963 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "Skriftinnstillingar"
+
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
 msgstr "Detaljert oversikt"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "Work Week View"
 msgstr "&Arbeidsveke"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "Week View"
 msgstr "&Trevising"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Månadsvising"
 
@@ -3462,23 +3453,22 @@ msgstr "Skildringar"
 msgid "Comment contains"
 msgstr "ikkje inneheld"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
-#, fuzzy
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
-msgstr "Skriv ut alle"
+msgstr "Kalender"
 
 #: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgåver"
@@ -3488,53 +3478,53 @@ msgstr "Oppgåver"
 msgid "Folder containing to-do items"
 msgstr "Fil alt i liste"
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 #, fuzzy
 msgid "New _Appointment"
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "Lagar eit nytt dokument"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:649
 #, fuzzy
 msgid "New _Task"
 msgstr "Oppgåve"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:358
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:367
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Eigenskapar for meldingsdel"
 
-#: calendar/gui/dialogs/alarm-options.c:377
+#: calendar/gui/dialogs/alarm-options.c:376
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Tar-val"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:385
 #, fuzzy
 msgid "Program Alarm Options"
 msgstr "Programplasseringar"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:394
 #, fuzzy
 msgid "Unknown Alarm Options"
 msgstr "Kjende program"
@@ -3560,9 +3550,8 @@ msgid "Repeat the alarm"
 msgstr "Utfører siste søk om att"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
-#, fuzzy
 msgid "Run program:"
-msgstr "Terminalprogram:"
+msgstr "Køyr program:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid ""
@@ -3594,51 +3583,51 @@ msgstr "time/timar"
 msgid "minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " dag"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 #, fuzzy
 msgid "1 day"
 msgstr "Vis dato"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Veke"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 #, fuzzy
 msgid "1 week"
 msgstr "Vis %1"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 #, fuzzy
 msgid "1 hour"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 second"
 msgstr "sekund"
@@ -3700,17 +3689,12 @@ msgstr "&Slett avtale"
 msgid "%s at the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, fuzzy, c-format
-msgid "%s at an unknown time"
-msgstr "Ukjend feil"
-
-#: calendar/gui/dialogs/alarm-page.c:445
+#: calendar/gui/dialogs/alarm-page.c:453
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3734,7 +3718,7 @@ msgstr "Påminning:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -3769,7 +3753,7 @@ msgstr "&Slett avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutt"
@@ -3834,7 +3818,7 @@ msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:963
 #, fuzzy
 msgid "Friday"
 msgstr "Fredag"
@@ -3850,7 +3834,7 @@ msgid "Minutes"
 msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Måndag"
 
@@ -3860,7 +3844,7 @@ msgid "O_verdue tasks:"
 msgstr "&Syntaksmerkingsmodusar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:964
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
@@ -3886,7 +3870,7 @@ msgid "Su_n"
 msgstr "Sun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Sundag"
 
@@ -3906,7 +3890,7 @@ msgid "Tas_ks due today:"
 msgstr "&Opplys syntaks"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:962
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
@@ -3931,13 +3915,13 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:960
 #, fuzzy
 msgid "Tuesday"
 msgstr "Tysdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:961
 #, fuzzy
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -3976,14 +3960,12 @@ msgid "_End of day:"
 msgstr "Slutt trekk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
 msgid "_Fri"
-msgstr "Fre"
+msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#, fuzzy
 msgid "_General"
-msgstr "Generelt"
+msgstr "_Generelt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
@@ -3991,9 +3973,8 @@ msgid "_Hide completed tasks after"
 msgstr "Neste melding"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
 msgid "_Mon"
-msgstr "Mån"
+msgstr "_Mån"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
@@ -4020,191 +4001,194 @@ msgstr "Ons"
 msgid "before the start of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på at du vil sletta denne metoden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 #, fuzzy
 msgid "This event has been deleted."
 msgstr "Inga hending valt."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 #, fuzzy
 msgid "This task has been deleted."
 msgstr "Dette elementet vert sletta for alltid."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Denne mappa kan ikkje slettast."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 #, fuzzy
 msgid "This event has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 #, fuzzy
 msgid "This task has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
-#, fuzzy
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
-msgstr " til:"
+msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#: calendar/gui/dialogs/comp-editor.c:671
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:676
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:679
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppgåver"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:682
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:696
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1054 mail/mail-callbacks.c:1876
+#: mail/mail-display.c:102
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1058 mail/mail-callbacks.c:1883
+#: mail/mail-display.c:106
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-#, fuzzy
+#: calendar/gui/dialogs/comp-editor.c:1104 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
-msgstr "Lagra som ..."
+msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1265
 #, fuzzy
 msgid "Unable to obtain current version!"
 msgstr "Kan ikkje setja opp utskriftstenaren."
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
@@ -4224,28 +4208,28 @@ msgstr "Delegert"
 msgid "Enter Delegate"
 msgstr "Slett"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 #, fuzzy
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 #, fuzzy
 msgid "Reminder"
 msgstr "Påminning:"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "Køyreplan ..."
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Møte"
 
@@ -4266,12 +4250,13 @@ msgid "Classification"
 msgstr "&Forstørring"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Eksponentiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Date & Time"
 msgstr "Dato"
@@ -4282,13 +4267,13 @@ msgid "F_ree"
 msgstr "Gresk"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Praksis"
@@ -4300,7 +4285,7 @@ msgid "Show Time As"
 msgstr "Vis brukarar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Samandrag:"
@@ -4315,35 +4300,15 @@ msgstr "Slutt-tid:"
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:422
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Bil-telefon"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-#, fuzzy
-msgid "Required Participants"
-msgstr "Tenarinformasjon"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Personleg informasjon"
-
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Non-Participants"
+#: calendar/gui/dialogs/meeting-page.c:623
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "F&jern rad ..."
@@ -4389,6 +4354,7 @@ msgid "Member"
 msgstr "Medlemmer"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4403,17 +4369,15 @@ msgstr "Mobil:"
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
-#, fuzzy
 msgid "Status"
-msgstr "Status:"
+msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:87
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
-#, fuzzy
 msgid "Type"
-msgstr "Type:"
+msgstr "Type"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
@@ -4427,8 +4391,9 @@ msgid "_Change Organizer"
 msgstr "Name=Organizer"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-meeting-time-sel.c:427
 #, fuzzy
-msgid "_Invite Others"
+msgid "_Invite Others..."
 msgstr "Andre ..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
@@ -4440,26 +4405,26 @@ msgstr "Planleggjar"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:932
 #, fuzzy
 msgid "on"
 msgstr "Mån"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dagen"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1088
 #, fuzzy
 msgid "on the"
 msgstr "Månad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1096
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1269
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -4478,9 +4443,8 @@ msgid "Exceptions"
 msgstr "Unntak"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-#, fuzzy
 msgid "Preview"
-msgstr "Førehandsvising:"
+msgstr "Førehandsvising"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
@@ -4535,20 +4499,15 @@ msgstr "veke(r) på:"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:51
-#, fuzzy
-msgid "Do you want to save changes?"
-msgstr "I ferd med å senda e-post ..."
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
@@ -4556,7 +4515,7 @@ msgstr ""
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, fuzzy, no-c-format
 msgid "% Complete"
-msgstr "Ferdig"
+msgstr "prosent ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #, fuzzy
@@ -4564,12 +4523,11 @@ msgid "Date Completed:"
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#, fuzzy
 msgid "Progress"
-msgstr "Framgong:"
+msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:938
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -4584,152 +4542,175 @@ msgstr "Prioritet:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 #, fuzzy
 msgid "Assignment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Skildring:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Start-dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-#, fuzzy
-msgid "_Confidential"
-msgstr "Eksponentiell"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "_Due Date:"
 msgstr "Forfallsdato:"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
 #, fuzzy
+msgid "Deleting selected objects"
+msgstr "Slett den valte oppgåva"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
-msgstr "Opna ..."
+msgstr "_Opne"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#, fuzzy
 msgid "C_ut"
-msgstr "Klipp ut"
+msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
-#, fuzzy
 msgid "_Copy"
-msgstr "Kopier"
+msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
-#, fuzzy
 msgid "_Paste"
-msgstr "Lim inn"
+msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppgåva"
 
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Trykk her for å leggja til ein ny virtuell vert."
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, fuzzy, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr "Ein bandindeks må vera valt i treet."
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:720
+#: camel/camel-filter-driver.c:836
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
@@ -4765,8 +4746,8 @@ msgstr "Start-dato:"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1460 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Samandrag"
 
@@ -4776,351 +4757,429 @@ msgid "Task sort"
 msgstr "Oppgåver"
 
 #: calendar/gui/e-calendar-table.etspec.h:19
-#, fuzzy
 msgid "URL"
-msgstr "URL:"
+msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Gå til &i dag"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "&Gå til side ..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Erstatt denne førekomsten?"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:469
+#: calendar/gui/e-itip-control.c:524
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:529
 msgid "Task begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:479
+#: calendar/gui/e-itip-control.c:534
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:538
 msgid "Begins: <b>"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Ferdig"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Informasjon"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "Ukjend feil"
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:721
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-#, c-format
-msgid "<b>Summary:</b> %s<br><br>"
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Vel ikon"
+
+#: calendar/gui/e-itip-control.c:779
+msgid "Update"
+msgstr "Oppdater"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+msgid "Accept"
+msgstr "Godta"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Mellombels"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Slett"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Skildring:"
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: calendar/gui/e-itip-control.c:867
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:872
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:873
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Møte"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:877
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Møte"
 
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:882
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:883
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:887
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Møte"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:892
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:893
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Vel ikon"
 
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "&Finn i melding ..."
 
-#: calendar/gui/e-itip-control.c:785
+#: calendar/gui/e-itip-control.c:917
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:918
 #, fuzzy
 msgid "Task Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:922
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:923
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:927
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:928
 #, fuzzy
 msgid "Task Update"
 msgstr "Slutt etter"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:932
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:933
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:937
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:938
 #, fuzzy
 msgid "Task Reply"
 msgstr "Svar"
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:942
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Dette er inga lokal fil.\n"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:948
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:968
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:972
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:973
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:977
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:978
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:983
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Private meldingar"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1052
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1130
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1276
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1316
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
-msgstr "%1 bit %2 %3"
+msgstr "%P %%"
 
 #: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
@@ -5132,9 +5191,8 @@ msgid "Calendar Message"
 msgstr "Skriv ut alle"
 
 #: calendar/gui/e-itip-control.glade.h:5
-#, fuzzy
 msgid "Date:"
-msgstr "Forfallsdato"
+msgstr "Dato:"
 
 #: calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
@@ -5160,88 +5218,106 @@ msgstr ""
 msgid "date-start"
 msgstr " start"
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+#: calendar/gui/e-meeting-model.c:94
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Bil-telefon"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#, fuzzy
+msgid "Required Participants"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/e-meeting-model.c:96
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
-#, fuzzy
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
-msgstr "Gruppenamn:"
+msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 #, fuzzy
 msgid "Resource"
 msgstr "Kjelder"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
-#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 #, fuzzy
 msgid "Needs Action"
 msgstr "Vel ikon"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 #, fuzzy
 msgid "Declined"
 msgstr "Slett"
 
-#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 #, fuzzy
 msgid "Delegated"
 msgstr "Slett"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 #, fuzzy
 msgid "In Process"
 msgstr "Framgong:"
@@ -5249,116 +5325,115 @@ msgstr "Framgong:"
 #. 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:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel.c:2023
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. 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:476
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1582
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:410
 #, fuzzy
 msgid "Out of Office"
 msgstr "Kontor"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:411
 #, fuzzy
 msgid "No Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:411
-#, fuzzy
-msgid "_Invite Others..."
-msgstr "Andre ..."
-
-#: calendar/gui/e-meeting-time-sel.c:431
-#, fuzzy
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
-msgstr "Val"
+msgstr "_Val"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:477
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "Forminsk"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:495
 #, fuzzy
 msgid "_Update Free/Busy"
 msgstr "Oppdateringsfrekvens"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:513
 #, fuzzy
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:530
 #, fuzzy
 msgid "_Autopick"
 msgstr "Automatisk"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:544
 #, fuzzy
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:561
 #, fuzzy
 msgid "_All People and Resources"
 msgstr "Alle filer og katalogar"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:623
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "&Helsingstekst:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:328
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Leitar etter tilleggsmodular"
+
+#: calendar/gui/e-tasks.c:355
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:367
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1315
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -5366,11 +5441,16 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1326
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
+#: calendar/gui/gnome-cal.c:1681
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Feil ved opning"
+
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -5407,49 +5487,46 @@ msgid "January"
 msgstr "Januar"
 
 #: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
 msgid "July"
 msgstr "Juli"
 
 #: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
 msgid "June"
 msgstr "Juni"
 
 #: calendar/gui/goto-dialog.glade.h:10
-#, fuzzy
 msgid "March"
 msgstr "Mars"
 
 #: calendar/gui/goto-dialog.glade.h:11
-#, fuzzy
 msgid "May"
-msgstr "Måndag"
+msgstr "Mai"
 
 #: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "November"
 msgstr "November"
 
 #: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
 msgid "October"
 msgstr "Oktober"
 
 #: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/itip-utils.c:570
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: calendar/gui/main.c:91
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr ""
@@ -5457,235 +5534,274 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 #, fuzzy
 msgid "Su"
 msgstr "Sum"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 #, fuzzy
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 #, fuzzy
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 #, fuzzy
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 #, fuzzy
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 #, fuzzy
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 #, fuzzy
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#, fuzzy
 msgid "%a %b %d"
-msgstr ""
+msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Denne månaden"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "Oppgåve"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "Status:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Prioritet:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Ferdig"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "Kategoriar"
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "&Innhald ..."
+
+#: calendar/gui/print.c:2386
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
-#, fuzzy
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
-msgstr "&Førehandsvising ..."
+msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 #, fuzzy
 msgid "Print Item"
 msgstr "Utskriftssystem"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 #, fuzzy
 msgid "Print Setup"
 msgstr "Speloppsett"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5693,125 +5809,125 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5840,7 +5956,7 @@ msgstr "Knapp (ikkje støtta av KControl)"
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5848,7 +5964,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5856,107 +5972,107 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
 #, fuzzy
 msgid "Resynchronizing with server"
 msgstr "Registrerer hjå tenaren ..."
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 #, fuzzy
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:661
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:670
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:685
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:702
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:690
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Kan ikkje dekryptera melding:"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:716 camel/camel-filter-driver.c:831
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:788
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:793 camel/camel-filter-driver.c:811
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:920
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:926
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1262
 #, fuzzy
 msgid "Moving messages"
 msgstr "Melding"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5965,7 +6081,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5974,7 +6090,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
@@ -5983,16 +6099,16 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:109
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:122
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
@@ -6000,48 +6116,48 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:198 camel/camel-lock-client.c:221
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:211
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunne ikkje starta %1."
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, fuzzy, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, fuzzy, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
@@ -6049,135 +6165,135 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, fuzzy, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, fuzzy, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikkje starta %1."
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 #, fuzzy
 msgid "(Unknown error)"
 msgstr "Ukjend feil"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, fuzzy, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -6198,7 +6314,7 @@ msgid "Connection cancelled"
 msgstr "Avbroten."
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -6208,13 +6324,12 @@ msgid "(unknown host)"
 msgstr ""
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
-#, fuzzy
 msgid "Operation cancelled"
-msgstr "Feil ved opning"
+msgstr "Operasjonen vart avbroten"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -6313,7 +6428,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -6332,10 +6447,11 @@ msgid "Unknown authentication state."
 msgstr "Inga autentisering i det heile"
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#, fuzzy
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -6363,55 +6479,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:611
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Lagar"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:532
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6459,17 +6575,17 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to verify certificates."
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:536
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6477,7 +6593,7 @@ msgid ""
 msgstr "Emne"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6487,7 +6603,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6499,7 +6615,7 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -6507,32 +6623,32 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:588
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Vidaresendt melding"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:749
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Vidaresendt melding"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
@@ -6566,64 +6682,64 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:299
-#: camel/providers/imap/camel-imap-message-cache.c:330
-#: camel/providers/imap/camel-imap-message-cache.c:362
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Berre sjekk for ny e-post."
@@ -6633,7 +6749,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
 msgid "Folders"
 msgstr "Mapper"
 
@@ -6668,28 +6784,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6697,84 +6813,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 #, fuzzy
 msgid "Local delivery"
 msgstr "Mapper"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:68
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in qmail maildir directories."
+#: camel/providers/local/camel-local-provider.c:69
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standardfil"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, fuzzy, c-format
 msgid "Local mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -6782,7 +6901,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
@@ -6790,7 +6909,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -6801,44 +6920,49 @@ msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:181
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Kunne ikkje leggja til melding:\n"
+
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-mh-folder.c:204
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 #, fuzzy
 msgid "No such message"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, fuzzy, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6848,34 +6972,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, fuzzy, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr ""
 
@@ -6893,14 +7017,14 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -6909,33 +7033,38 @@ msgstr ""
 "%2"
 
 #: camel/providers/local/camel-mbox-folder.c:265
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Feil ved opning"
+
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6945,44 +7074,46 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, fuzzy, c-format
 msgid "`%s' is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, fuzzy, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synkroniser"
 
-#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -6990,20 +7121,21 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -7011,8 +7143,8 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -7020,59 +7152,64 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
 
 #: camel/providers/local/camel-mh-folder.c:172
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Sender ei melding til ein nettverksspelar"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -7082,61 +7219,41 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikkje opna katalogen %1"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-spool-summary.c:379
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Synkroniser"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
@@ -7144,413 +7261,412 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Fann ikkje fil"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Vidaresendt melding frå %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, fuzzy, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Slett e-post frå tenaren"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slå saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 #, fuzzy
 msgid "Message storage"
 msgstr "Meldingsliste"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "&La e-posten liggja på tenaren."
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, fuzzy, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjend"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, fuzzy, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Slett e-post frå tenaren"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
-#, fuzzy
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
-msgstr "Send"
+msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, fuzzy, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Vidaresendt melding frå %1"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "Vidaresendt melding frå %1"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:179
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Service ready"
 msgstr "Skjul"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:217
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7558,175 +7674,174 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:684
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Møte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:758
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:800
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
-#, fuzzy
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
-msgstr "%1 byte"
+msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, fuzzy, c-format
 msgid "%u bytes"
-msgstr "%1 byte ="
+msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.1fK"
 msgstr "%1 KB"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, fuzzy, c-format
 msgid "%.1fM"
 msgstr "%1 MB"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, fuzzy, c-format
 msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frå lista"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
@@ -7761,7 +7876,7 @@ msgstr "MIME-type"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -7769,14 +7884,14 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Svar"
@@ -7784,34 +7899,32 @@ msgstr "Svar"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:392
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
-msgstr "&CC:"
+msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
-msgstr "&Bcc:"
+msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7819,11 +7932,10 @@ msgstr ""
 
 #: composer/e-msg-composer-select-file.c:228
 #: ui/evolution-message-composer.xml.h:2
-#, fuzzy
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:700
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7832,67 +7944,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:883
 msgid "Save as..."
-msgstr "Lagra som ..."
+msgstr "Lagre som ..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:892
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:896
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:918
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:937
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:1008
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1069
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1083
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1092
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7901,13 +8013,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1194
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1345
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -7917,53 +8029,59 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1352
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Vidaresendt melding frå %1"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1375
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1524
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1899 composer/e-msg-composer.c:2340
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2407
+#: composer/e-msg-composer.c:2357
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2380
 #, fuzzy
-msgid "Could not create composer window."
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:360
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:375
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
 #: data/evolution.desktop.in.h:2
-#, fuzzy
 msgid "The Evolution groupware suite"
-msgstr "Evalueringsfeil"
+msgstr "Gruppevareverktyet Evolution"
 
 #: data/evolution.keys.in.h:1
-#, fuzzy
 msgid "address card"
-msgstr "Adresse"
+msgstr "adressekort"
 
 #: data/evolution.keys.in.h:2
 #, fuzzy
@@ -7971,14 +8089,12 @@ msgid "calendar information"
 msgstr "Informasjon"
 
 #: default_user/searches.xml.h:1
-#, fuzzy
 msgid "Body contains"
-msgstr "Handlingar"
+msgstr "Kropp inneheld"
 
 #: default_user/searches.xml.h:2
-#, fuzzy
 msgid "Body does not contain"
-msgstr "ikkje inneheld"
+msgstr "Kropp inneheld ikkje"
 
 #: default_user/searches.xml.h:3
 #, fuzzy
@@ -8010,16 +8126,25 @@ msgstr "Emne"
 msgid "Subject does not contain"
 msgstr "Emne"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr ""
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
@@ -8078,34 +8203,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%H:%M"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
-#, fuzzy
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
-msgstr "%H:%M"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
-#, fuzzy
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
-msgstr "%H:%M"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
-#, fuzzy
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1390 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
-msgstr "%H:%M"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1387 widgets/misc/e-dateedit.c:1614
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 #, fuzzy
 msgid "%I %p"
 msgstr "%H:%M"
@@ -8230,9 +8352,8 @@ msgid "ago"
 msgstr "Tag"
 
 #: filter/filter-datespec.c:711 mail/message-list.c:939
-#, fuzzy
 msgid "%b %d %l:%M %p"
-msgstr "%H:%M"
+msgstr "%b %d %l:%M %p"
 
 #: filter/filter-datespec.c:722
 #, fuzzy
@@ -8255,23 +8376,23 @@ msgstr "Tiaren"
 msgid "Add action"
 msgstr "&Legg til handling"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:314
 #, fuzzy
 msgid "<click here to select a folder>"
 msgstr "Trykk for å velja ein skrifttype"
@@ -8289,45 +8410,45 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 #, fuzzy
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 #, fuzzy
 msgid "Execute actions"
 msgstr "Køyr autorun.sh"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 #, fuzzy
 msgid "incoming"
 msgstr "Koding"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 #, fuzzy
 msgid "outgoing"
 msgstr "Oversikt"
@@ -8393,9 +8514,8 @@ msgid "Attachments"
 msgstr "Vedlegg"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
 msgid "contains"
-msgstr "Handlingar"
+msgstr "inneheld"
 
 #: filter/libfilter-i18n.h:8
 #, fuzzy
@@ -8465,9 +8585,8 @@ msgid "exists"
 msgstr "Neste"
 
 #: filter/libfilter-i18n.h:23
-#, fuzzy
 msgid "Expression"
-msgstr "&Yrke:"
+msgstr "Uttrykk"
 
 #: filter/libfilter-i18n.h:24
 msgid "Important"
@@ -8487,8 +8606,9 @@ msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
+#, fuzzy
 msgid "is not"
-msgstr ""
+msgstr "er ikkje"
 
 #: filter/libfilter-i18n.h:29
 #, fuzzy
@@ -8553,7 +8673,7 @@ msgstr "Svar til alle:"
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 #, fuzzy
 msgid "Sender"
 msgstr "Send"
@@ -8589,7 +8709,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
@@ -8603,16 +8723,16 @@ msgstr "Slutt etter"
 msgid "was before"
 msgstr ""
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Linjer"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:278
 #, fuzzy
 msgid "Add Rule"
 msgstr "Legg til fil"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:344
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Rediger fil"
@@ -8622,102 +8742,97 @@ msgstr "Rediger fil"
 msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Flyttar"
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "Flyttar"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sender %1"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 #, fuzzy
 msgid "Mail"
 msgstr "Send"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:230
-#, fuzzy
-msgid "GnomeCard:"
-msgstr "Teikn"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Leitar etter tilleggsmodular"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 #, fuzzy
 msgid "Pine"
 msgstr "Skriv ut"
@@ -8761,90 +8876,89 @@ msgstr "Øydelagd oppsettfil."
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:100
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Fil alt i liste"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Mapper"
 
-#: mail/component-factory.c:98
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Mapper"
 
-#: mail/component-factory.c:125
+#: mail/component-factory.c:129
 #, fuzzy, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:432
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet på spelarane"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Legg til melding"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:973
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Legg til melding"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser-ui.c:269
-#, fuzzy
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
-msgstr "Eigenskapar ..."
+msgstr "Eigenskapar"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -8852,190 +8966,190 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:769
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "Legg til &ny"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:773
 #, fuzzy, c-format
 msgid "%d hidden"
 msgstr "gøymt"
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:778
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Slett"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Legg til &ny"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:803
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "Legg til &ny"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:805
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "(%1 totalt)"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1077
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1458
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1459
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1460
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1461
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1465
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1466
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1467
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1468
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Private meldingar"
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
-#, fuzzy
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
-msgstr "Lagra som ..."
+msgstr "_Lagre som ..."
 
-#: mail/folder-browser.c:1404
-#, fuzzy
+#: mail/folder-browser.c:1478
 msgid "_Print"
-msgstr "Skriv ut"
+msgstr "_Skriv ut"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til:"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
-#, fuzzy
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
-msgstr "Svar til alle:"
+msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1411
-#, fuzzy
+#: mail/folder-browser.c:1485
 msgid "_Forward"
-msgstr "Fram"
+msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1489
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1490
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1494
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1495
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1501
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1506
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1656
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1660
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Fil alt i liste"
 
+#: mail/folder-browser.h:26
+msgid "Default"
+msgstr "Forvald"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -9061,36 +9175,46 @@ msgstr "Importer Outlook Express 4"
 
 #: mail/local-config.glade.h:1
 #, fuzzy
+msgid "Body contents"
+msgstr "Handlingar"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
 msgid "Current store format:"
 msgstr "Kunne ikkje starta %1."
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "Set inn"
+
+#: mail/local-config.glade.h:4
 #, fuzzy
 msgid "Mailbox Format"
 msgstr "Format"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 #, fuzzy
 msgid "New store format:"
 msgstr "&Ny type"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 #, fuzzy
 msgid "maildir"
 msgstr "E-post 2"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 #, fuzzy
 msgid "mh"
 msgstr "ms"
@@ -9111,17 +9235,17 @@ msgstr "KDeelop-installering"
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 #, fuzzy
 msgid "Save signature"
 msgstr "Vis sig&natur"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -9131,14 +9255,13 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1629
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
 #: mail/mail-accounts.c:144
-#, fuzzy
 msgid " (default)"
-msgstr "Standard"
+msgstr " (standard)"
 
 #: mail/mail-accounts.c:189
 msgid "Disable"
@@ -9146,59 +9269,59 @@ msgstr "Skru av"
 
 #: mail/mail-accounts.c:191
 msgid "Enable"
-msgstr "på"
+msgstr "Skru på"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Slett"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Skriftinnstillingar"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Postkasse: %1"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Emne"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "Melding frå %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "E-post&liste for språket:"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9206,136 +9329,135 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Hentar data frå %1"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 #, fuzzy
 msgid "This message contains invalid recipients:"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Ukjend feil"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1263
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1265
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1732
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1757
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1796
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1810
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1836
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Ingen rektangel valt!"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1930
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1932
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
-#, fuzzy
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
-msgstr "Flyttar"
+msgstr "Åtvaring"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9343,33 +9465,33 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2115
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2223
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2298
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2344
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2446
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil sletta denne overføringa?"
@@ -9411,17 +9533,17 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.c:315
+#: mail/mail-config.c:316
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Små ikon"
 
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -9432,16 +9554,16 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:1629
+#: mail/mail-config.c:1654
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "Innboks"
 
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -9462,33 +9584,33 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account"
 msgstr "Små ikon"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
@@ -9503,29 +9625,24 @@ msgstr "Autentisering:"
 
 #: mail/mail-config.glade.h:13
 #, fuzzy
-msgid "Authentication Type: "
-msgstr "Autentisering:"
+msgid "Checking for New Mail"
+msgstr "Berre sjekk for ny e-post."
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Certificate ID:"
-msgstr "Dine SSL-sertifikat"
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Ny melding"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Forventar %1"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9535,392 +9652,413 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "Fjern ramme"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "Default character encoding: "
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Detaljar ..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Display"
 msgstr "Vis"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
-#, fuzzy
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
-msgstr "Ingen"
+msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Kladd"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Drafts folder:"
-msgstr "Lagra i &kladdemappe"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "E_nable"
 msgstr "på"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+#, fuzzy
 msgid "Edit..."
-msgstr "Endra ..."
+msgstr "Rediger ..."
 
-#: mail/mail-config.glade.h:36
-#, fuzzy
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
-msgstr "på"
+msgstr "På"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "&IMAP 4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Vinkel"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "News"
 msgstr "Ny ..."
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Optional Information"
 msgstr "Personleg informasjon"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "E-post 2"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Quoted"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Fjern denne oppføringa"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for oppkopling på nytt"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "Er sikker"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Mottek meldingar frå %1"
+
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
-msgid "Sent messages folder:"
-msgstr "Mottek meldingar frå %1"
+msgid "Ser_ver requires authentication"
+msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 #, fuzzy
-msgid "Server Type: "
+msgid "Server _Type: "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:80
-#, fuzzy
-msgid "Server requires _authentication"
-msgstr "Autentisering:"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Mapper"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardfil"
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Autentisering:"
+
 #: mail/mail-config.glade.h:94
 #, fuzzy
-msgid "_Automatically check for new mail every"
+msgid "_Automatically check for new mail"
 msgstr "enkle innlegg"
 
 #: mail/mail-config.glade.h:95
 #, fuzzy
-msgid "_Check for supported types"
-msgstr "Vel modemtype ..."
+msgid "_Certificate ID:"
+msgstr "Dine SSL-sertifikat"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Lagra i &kladdemappe"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Email Address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_Empty trash folders on exit"
 msgstr "Tøm papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Merkingsvilkår"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Host:"
 msgstr "time/timar"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Lag meldingar og slå saman"
 
-#: mail/mail-config.glade.h:107
-#, fuzzy
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
-msgstr "Navn:"
+msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Path:"
 msgstr "Sti:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Tenar:"
+
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "_Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 #, fuzzy
+msgid "_every"
+msgstr "Kvar"
+
+#: mail/mail-config.glade.h:119
 msgid "description"
-msgstr "Skildring:"
+msgstr "skildring"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "newswindow1"
 msgstr "Nytt vindauge"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "placeholder"
 msgstr "Bruk &plasshaldarar"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
@@ -9970,211 +10108,200 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
+#, fuzzy
 msgid "Hide"
-msgstr "Skjul"
+msgstr "Gøym"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1135
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1617
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1622
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Lagrar fil ..."
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1625
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagra bilete som"
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
-#, fuzzy
+#: mail/mail-format.c:760
 msgid "Date"
-msgstr "Forfallsdato"
+msgstr "Dato"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "E-post-adresse:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:904 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Frå"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:907
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:911 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:919
-#, fuzzy
+#: mail/mail-format.c:915
 msgid "Cc"
-msgstr "&CC:"
+msgstr "Cc"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:919
 #, fuzzy
 msgid "Bcc"
 msgstr "&Bcc:"
 
-#: mail/mail-format.c:1370
-#, fuzzy
-msgid "No GPG/PGP program configured."
-msgstr "Ingen bilete tilgjengeleg."
-
-#: mail/mail-format.c:1386
-#, fuzzy
-msgid "Encrypted message not displayed"
-msgstr "Endra tidsvising"
-
-#: mail/mail-format.c:1397
-#, fuzzy
-msgid "Encrypted message"
-msgstr "Lagra melding"
+#: mail/mail-format.c:1821
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
 
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
+#: mail/mail-format.c:1844
+msgid "Evolution does not recognize this type of signed message."
 msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1860
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2076
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2090
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2095
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2124
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2132
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2137
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1407
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:251
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -10183,7 +10310,7 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:254
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -10192,26 +10319,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr ""
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Lagra som"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:893
 #, fuzzy
 msgid "Working"
 msgstr "Flyttar"
@@ -10221,132 +10329,126 @@ msgstr "Flyttar"
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:249
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:557
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:677
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:696
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 #, fuzzy
 msgid "Complete."
 msgstr "Ferdig"
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:791
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:871
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "kan ikkje opna fila %1"
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1011
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
-#, fuzzy
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
 msgid "Trash"
-msgstr "Oppgåve"
+msgstr "Papirkorg"
 
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1194
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1237
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1309
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagar ei ny mappe"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1523
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1559
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1675
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1761
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1873
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1901
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10355,29 +10457,29 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1975
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1991
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2022
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2091
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå ..."
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar frå ..."
@@ -10387,112 +10489,121 @@ msgstr "Koplar frå ..."
 msgid "_Search"
 msgstr "Søk"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 #, fuzzy
 msgid "Empty Message"
 msgstr "Legg til melding"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 #, fuzzy
 msgid "Find in Message"
 msgstr "&Finn i melding ..."
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Skil mellom store og små bokstavar"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 #, fuzzy
 msgid "Search Forward"
 msgstr "30 sekund framover"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 #, fuzzy
 msgid "Matches:"
 msgstr "Treff:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Avbroten."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar:"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Type:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Send"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Avbryt"
 
-#: mail/mail-send-recv.c:333
-#, fuzzy
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
-msgstr "Oppdater ..."
+msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 #, fuzzy
 msgid "Waiting..."
 msgstr "Avsluttar ..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 #, fuzzy
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 #, fuzzy
 msgid "User canceled operation."
 msgstr ""
 "Brukaren avbraut handling\n"
 "%1"
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Oppgi ditt OpenPGP-passord"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Lagra som"
+
+#: mail/mail-tools.c:248
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Lagar ei ny mappe"
@@ -10502,7 +10613,7 @@ msgstr "Lagar ei ny mappe"
 msgid "Updating vfolders for uri: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -10511,32 +10622,32 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
+#: mail/mail-vfolder.c:723
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Rediger filterreglar"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:886
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 #, fuzzy
 msgid "(No subject)"
 msgstr "Fwd: (ingen emne)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Legg til melding"
@@ -10585,29 +10696,28 @@ msgid "Highest"
 msgstr "1 (høgast)"
 
 #: mail/message-list.c:903
+#, fuzzy
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: mail/message-list.c:910
-#, fuzzy
 msgid "Today %l:%M %p"
-msgstr "%H:%M"
+msgstr "I dag, %l:%M %p"
 
 #: mail/message-list.c:919
+#, fuzzy
 msgid "Yesterday %l:%M %p"
-msgstr ""
+msgstr "I går %l:%M %p"
 
 #: mail/message-list.c:931
-#, fuzzy
 msgid "%a %l:%M %p"
-msgstr "%H:%M"
+msgstr "%a %l:%M %p"
 
 #: mail/message-list.c:941
-#, fuzzy
 msgid "%b %d %Y"
-msgstr "%1 bit %2 %3"
+msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2330
 #, fuzzy
 msgid "Generating message list"
 msgstr "Melding"
@@ -10635,28 +10745,27 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
 msgid "Folder"
-msgstr "Mapper"
+msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1520
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Inga hending valt."
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr ""
 
@@ -10703,77 +10812,70 @@ msgstr "Kjelder"
 msgid "Evolution component for the executive summary."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 #, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
+msgid "Cannot initialize Evolution's Summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 #, fuzzy
 msgid "Appointments"
 msgstr "Avtale"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
 #, fuzzy
 msgid "No appointments"
 msgstr "Avtale"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%1 bit %2 %3"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:379
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 #, fuzzy
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:423
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:446
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:918
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppføring"
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:926
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi namnet på gruppa du vil leggja til."
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:930
+#, fuzzy
 msgid "Name:"
-msgstr "Navn:"
+msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1476
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Spørjinga inneheld"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
@@ -10781,31 +10883,31 @@ msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:528
 #, fuzzy
 msgid "News Feed"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:248
 #, fuzzy
 msgid "No tasks"
 msgstr "Ingen oppgåver ..."
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "Skildring:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 #, fuzzy
 msgid "My Weather"
 msgstr "Vatn"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:559
 #, fuzzy
 msgid "Weather"
 msgstr "Vatn"
@@ -10814,31 +10916,30 @@ msgstr "Vatn"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
-msgid "KBOS:EGAA:RJTT"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:691
-#, fuzzy
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
-msgstr "Start om att"
+msgstr "Områder"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%1 bit %2 %3"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Samandrag"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -10854,61 +10955,53 @@ msgid "°C"
 msgstr "°"
 
 #: my-evolution/metar.c:33
-#, fuzzy
 msgid "knots"
-msgstr "Knop"
+msgstr "knop"
 
 #: my-evolution/metar.c:33
+#, fuzzy
 msgid "kph"
-msgstr ""
+msgstr "km/t"
 
 #: my-evolution/metar.c:38
-#, fuzzy
 msgid "inHg"
-msgstr "&Linje"
+msgstr "inHg"
 
 #: my-evolution/metar.c:38
-#, fuzzy
 msgid "mmHg"
-msgstr "mm"
+msgstr "mmHg"
 
 #: my-evolution/metar.c:41
 msgid "miles"
 msgstr "miles"
 
 #: my-evolution/metar.c:41
-#, fuzzy
 msgid "kilometers"
-msgstr "meter"
+msgstr "kilometer"
 
 #: my-evolution/metar.c:44
-#, fuzzy
 msgid "Clear sky"
-msgstr "Tøm liste"
+msgstr "Klar himmel"
 
 #: my-evolution/metar.c:45
-#, fuzzy
 msgid "Broken clouds"
-msgstr "Broten"
+msgstr "Oppbrotne skyer"
 
 #: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr ""
 
 #: my-evolution/metar.c:47
-#, fuzzy
 msgid "Few clouds"
-msgstr "Fil lukka."
+msgstr "Få skyer"
 
 #: my-evolution/metar.c:48
-#, fuzzy
 msgid "Overcast"
-msgstr "Overtrekk"
+msgstr "Overskya"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
-#, fuzzy
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
-msgstr "(ugyldig)"
+msgstr "Ugyldig"
 
 #: my-evolution/metar.c:63
 msgid "Variable"
@@ -10919,36 +11012,34 @@ msgid "North"
 msgstr "Nord"
 
 #: my-evolution/metar.c:64
-#, fuzzy
 msgid "North - NorthEast"
-msgstr "Nord-Korea"
+msgstr "Nord - Nordaust"
 
 #: my-evolution/metar.c:64
-#, fuzzy
 msgid "Northeast"
-msgstr "Notat"
+msgstr "Nordaust"
 
 #: my-evolution/metar.c:64
+#, fuzzy
 msgid "East - NorthEast"
-msgstr ""
+msgstr "Aust - Nordaust"
 
 #: my-evolution/metar.c:65
 msgid "East"
 msgstr "Aust"
 
 #: my-evolution/metar.c:65
+#, fuzzy
 msgid "East - Southeast"
-msgstr ""
+msgstr "Aust - Søraust"
 
 #: my-evolution/metar.c:65
-#, fuzzy
 msgid "Southeast"
-msgstr "Sør"
+msgstr "Søraust"
 
 #: my-evolution/metar.c:65
-#, fuzzy
 msgid "South - Southeast"
-msgstr "Sør-Korea"
+msgstr "Sør - Søraust"
 
 #: my-evolution/metar.c:66
 msgid "South"
@@ -10956,16 +11047,15 @@ msgstr "Sør"
 
 #: my-evolution/metar.c:66
 msgid "South - Southwest"
-msgstr ""
+msgstr "Sør - Sørvest"
 
 #: my-evolution/metar.c:66
-#, fuzzy
 msgid "Southwest"
-msgstr "Sør"
+msgstr "Sørvest"
 
 #: my-evolution/metar.c:66
 msgid "West - Southwest"
-msgstr ""
+msgstr "Vest - Sørvest"
 
 #: my-evolution/metar.c:67
 msgid "West"
@@ -10973,1226 +11063,1214 @@ msgstr "Vest"
 
 #: my-evolution/metar.c:67
 msgid "West - Northwest"
-msgstr ""
+msgstr "Vest - Nordvest"
 
 #: my-evolution/metar.c:67
-#, fuzzy
 msgid "Northwest"
-msgstr "Notat"
+msgstr "Nordvest"
 
 #: my-evolution/metar.c:67
-#, fuzzy
 msgid "North - Northwest"
-msgstr "Nord-Korea"
+msgstr "Nord - Nordvest"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 #, fuzzy
 msgid "Drizzle"
 msgstr "Drev"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 #, fuzzy
 msgid "Light drizzle"
 msgstr "Lys brikke"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 #, fuzzy
 msgid "Moderate drizzle"
 msgstr "moderert"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 #, fuzzy
 msgid "Shallow drizzle"
 msgstr "Skuggefil:"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 #, fuzzy
 msgid "Patches of drizzle"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:100
-#, fuzzy
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
-msgstr "Nautisk mil"
+msgstr "Delvis yr"
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
-#, fuzzy
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
-msgstr "Understrek"
+msgstr "Tordenstorm"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 #, fuzzy
 msgid "Windy drizzle"
 msgstr "Endra vindaugsstorleik"
 
-#: my-evolution/metar.c:100
-#, fuzzy
+#: my-evolution/metar.c:137
 msgid "Showers"
-msgstr "Vis brukarar"
+msgstr "Regnbyer"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 #, fuzzy
 msgid "Drifting drizzle"
 msgstr "Skriv indeksfil"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 #, fuzzy
 msgid "Freezing drizzle"
 msgstr "Ledig storleik"
 
 #. RAIN
-#: my-evolution/metar.c:101
-#, fuzzy
+#: my-evolution/metar.c:142
 msgid "Rain"
-msgstr "Resultat"
+msgstr "Regn"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
-#, fuzzy
+#: my-evolution/metar.c:144
 msgid "Light rain"
-msgstr "Lyssetjing"
+msgstr "Lett regn"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 #, fuzzy
 msgid "Moderate rain"
 msgstr "moderert"
 
-#: my-evolution/metar.c:101
-#, fuzzy
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
-msgstr "Dato-område"
+msgstr "Tungt regn"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 #, fuzzy
 msgid "Shallow rain"
 msgstr "Vis igjen"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 #, fuzzy
 msgid "Patches of rain"
 msgstr "Stioppsett"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 #, fuzzy
 msgid "Partial rainfall"
 msgstr "Gradvis overgang vertikalt"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 #, fuzzy
 msgid "Rain showers"
 msgstr "Les mapper"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 #, fuzzy
 msgid "Drifting rain"
 msgstr "Under ei økt"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Freezing rain"
 msgstr "&Helsingstekst:"
 
 #. SNOW
-#: my-evolution/metar.c:102
-#, fuzzy
+#: my-evolution/metar.c:157
 msgid "Snow"
-msgstr "nei"
+msgstr "Snø"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 #, fuzzy
 msgid "Snow in the vicinity"
 msgstr "Vis &linjetal"
 
-#: my-evolution/metar.c:102
-#, fuzzy
+#: my-evolution/metar.c:159
 msgid "Light snow"
-msgstr "Lyssetjing"
+msgstr "Lett snø"
 
-#: my-evolution/metar.c:102
-#, fuzzy
+#: my-evolution/metar.c:160
 msgid "Moderate snow"
-msgstr "Målar vist"
+msgstr "Moderat snø"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 #, fuzzy
 msgid "Heavy snow"
 msgstr "Overskriftsrader"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 #, fuzzy
 msgid "Shallow snow"
 msgstr "Vis vindauge"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 #, fuzzy
 msgid "Patches of snow"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
-#, fuzzy
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
-msgstr "Sensorlesar"
+msgstr "Snøstorm"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 #, fuzzy
 msgid "Snow showers"
 msgstr "Vis brukarar"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 #, fuzzy
 msgid "Drifting snow"
 msgstr "Skildring i rader"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 #, fuzzy
 msgid "Freezing snow"
 msgstr "Skrifttype for helsing"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 #, fuzzy
 msgid "Snow grains"
 msgstr "Vis igjen"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 #, fuzzy
 msgid "Light snow grains"
 msgstr "Hev vindauge"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 #, fuzzy
 msgid "Heavy snow grains"
 msgstr "ikkje ha dekorasjonar"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 #, fuzzy
 msgid "Shallow snow grains"
 msgstr "Vis &informasjon"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 #, fuzzy
 msgid "Patches of snow grains"
 msgstr "Stiar til spooler-kommandoar:"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 #, fuzzy
 msgid "Blowing snow grains"
 msgstr "Rekningsinformasjon"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 #, fuzzy
 msgid "Snow grain showers"
 msgstr "Vis skjulte ressursar"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 #, fuzzy
 msgid "Few ice crystals"
 msgstr "Færre kriterium"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 #, fuzzy
 msgid "Heavy ice crystals"
 msgstr "Einingstilstand"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 #, fuzzy
 msgid "Few ice pellets"
 msgstr "Ny snill-verdi:"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 #, fuzzy
 msgid "Moderate ice pellets"
 msgstr "Slå saman celler"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 #, fuzzy
 msgid "Shallow ice pellets"
 msgstr "Vis klientar"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 #, fuzzy
 msgid "Partial ice pellets"
 msgstr "Tilgjengelege appletar"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 #, fuzzy
 msgid "Drifting ice pellets"
 msgstr "Skriv indeksfil"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
-#, fuzzy
+#: my-evolution/metar.c:217
 msgid "Hail"
-msgstr "Send"
+msgstr "Hagl"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
-#, fuzzy
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
-msgstr "Lyssetjing"
+msgstr "Lett Hagl"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 #, fuzzy
 msgid "Moderate hail"
 msgstr "moderert"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Vis &alle"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 #, fuzzy
 msgid "Patches of hail"
 msgstr "Endringsdato"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "Kritisk feil"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 #, fuzzy
 msgid "Hailstorm"
 msgstr "Historie"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 #, fuzzy
 msgid "Blowing hail"
 msgstr "lastar fil"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 #, fuzzy
 msgid "Hail showers"
 msgstr "Ekte brukarar"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 #, fuzzy
 msgid "Drifting hail"
 msgstr "Utskrift mislukkast."
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Mottek e-post"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 #, fuzzy
 msgid "Small hail"
 msgstr "Lite"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Vis &heile meldingshovudet"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 #, fuzzy
 msgid "Small hailstorm"
 msgstr "Små steg:"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 #, fuzzy
 msgid "Blowing small hail"
 msgstr "Lukkar alle filer ..."
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 #, fuzzy
 msgid "Drifting small hail"
 msgstr "Tradisjonell KMail"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Kjende program"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 #, fuzzy
 msgid "Light precipitation"
 msgstr "Pilot-program"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 #, fuzzy
 msgid "Moderate precipitation"
 msgstr "Lågare presisjon"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 #, fuzzy
 msgid "Heavy precipitation"
 msgstr "Anna program"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 #, fuzzy
 msgid "Shallow precipitation"
 msgstr "Vis &skildring"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 #, fuzzy
 msgid "Patches of precipitation"
 msgstr "Stioppsett"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 #, fuzzy
 msgid "Partial precipitation"
 msgstr "Pilot-program"
 
-#: my-evolution/metar.c:108
-#, fuzzy
+#: my-evolution/metar.c:255
 msgid "Unknown thunderstorm"
-msgstr "Ukjend feil"
+msgstr "Ukjend tordenstorm"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 #, fuzzy
 msgid "Blowing precipitation"
 msgstr "Feil spesifikasjon av port."
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 #, fuzzy
 msgid "Showers, type unknown"
 msgstr "Ukjend port"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 #, fuzzy
 msgid "Drifting precipitation"
 msgstr "Feil spesifikasjon av port."
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Feil spesifikasjon av port."
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 #, fuzzy
 msgid "Mist"
 msgstr "er"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 #, fuzzy
 msgid "Light mist"
 msgstr "Lyssetjing"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 #, fuzzy
 msgid "Moderate mist"
 msgstr "Mappeliste"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 #, fuzzy
 msgid "Thick mist"
 msgstr "Kallenamn-liste"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 #, fuzzy
 msgid "Shallow mist"
 msgstr "Vis eining"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 #, fuzzy
 msgid "Patches of mist"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "Innleggliste"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 #, fuzzy
 msgid "Mist with wind"
 msgstr "Maksimer vindauget"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Utskriftsmetode"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 #, fuzzy
 msgid "Freezing mist"
 msgstr "Skrifttype for helsing"
 
 #. FOG
-#: my-evolution/metar.c:110
-#, fuzzy
+#: my-evolution/metar.c:277
 msgid "Fog"
-msgstr "For"
+msgstr "Tåke"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
-#, fuzzy
+#: my-evolution/metar.c:279
 msgid "Light fog"
-msgstr "Lyssetjing"
+msgstr "Lett tåke"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 #, fuzzy
 msgid "Moderate fog"
 msgstr "moderert"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
+#, fuzzy
 msgid "Thick fog"
-msgstr ""
+msgstr "Tjukk tåke"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 #, fuzzy
 msgid "Shallow fog"
 msgstr "Vis &logg"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 #, fuzzy
 msgid "Patches of fog"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 #, fuzzy
 msgid "Partial fog"
 msgstr "Katalog"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Logg-vindauge"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 #, fuzzy
 msgid "Drifting fog"
 msgstr "Skrifttype for helsing"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 #, fuzzy
 msgid "Freezing fog"
 msgstr "Skrifttype for helsing"
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 #, fuzzy
 msgid "Smoke"
 msgstr "modem"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 #, fuzzy
 msgid "Thin smoke"
 msgstr "gjer trekk"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 #, fuzzy
 msgid "Moderate smoke"
 msgstr "Format"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 #, fuzzy
 msgid "Thick smoke"
 msgstr "&Ur-modus"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Vis meny"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 #, fuzzy
 msgid "Patches of smoke"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 #, fuzzy
 msgid "Partial smoke"
 msgstr "Variabelnamn"
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "Skiljeteikn for tusental:"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "&Slett avtale"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 #, fuzzy
 msgid "Drifting smoke"
 msgstr "&Teiknemodus"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 #, fuzzy
 msgid "Patches of volcanic ash"
 msgstr "Stiar til spooler-kommandoar:"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Stiar til spooler-kommandoar:"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
-msgstr ""
+#: my-evolution/metar.c:317
+#, fuzzy
+msgid "Showers of volcanic ash"
+msgstr "Stiar til spooler-kommandoar:"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
-#, fuzzy
+#: my-evolution/metar.c:322
 msgid "Sand"
-msgstr "og"
+msgstr "Sand"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 #, fuzzy
 msgid "Light sand"
 msgstr "Høgrehendt"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 #, fuzzy
 msgid "Moderate sand"
 msgstr "moderert"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 #, fuzzy
 msgid "Heavy sand"
 msgstr "Spel lyd"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 #, fuzzy
 msgid "Patches of sand"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 #, fuzzy
 msgid "Partial sand"
 msgstr "Marshalløyane"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 #, fuzzy
 msgid "Blowing sand"
 msgstr "lastar fil"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 #, fuzzy
 msgid "Drifting sand"
 msgstr "Redigeringsko&mmando"
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "Hz"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 #, fuzzy
 msgid "Light haze"
 msgstr "Høgrehendt"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 #, fuzzy
 msgid "Moderate haze"
 msgstr "moderert"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 #, fuzzy
 msgid "Thick haze"
 msgstr "&Breidd"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 #, fuzzy
 msgid "Shallow haze"
 msgstr "Vis dato"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 #, fuzzy
 msgid "Patches of haze"
 msgstr "Endringsdato"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 #, fuzzy
 msgid "Partial haze"
 msgstr "Variabelnamn"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 #, fuzzy
 msgid "Haze with wind"
 msgstr "Maksimer vindauget"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 #, fuzzy
 msgid "Drifting haze"
 msgstr "Utskrift mislukkast."
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 #, fuzzy
 msgid "Freezing haze"
 msgstr "Ledig storleik"
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "Sprut"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
-msgstr ""
+#: my-evolution/metar.c:353
+#, fuzzy
+msgid "Spray in the vicinity"
+msgstr "Vis &linjetal"
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
-msgstr ""
+#: my-evolution/metar.c:354
+#, fuzzy
+msgid "Light spray"
+msgstr "Høgrehendt"
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "moderert"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
-msgstr ""
+#: my-evolution/metar.c:356
+#, fuzzy
+msgid "Heavy spray"
+msgstr "Spel lyd"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:357
 #, fuzzy
-msgid "Shallow sprays"
+msgid "Shallow spray"
 msgstr "Vis brukarar"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:358
 #, fuzzy
-msgid "Patches of sprays"
+msgid "Patches of spray"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Marshalløyane"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
-msgstr ""
+#: my-evolution/metar.c:361
+#, fuzzy
+msgid "Blowing spray"
+msgstr "lastar fil"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:363
 #, fuzzy
-msgid "Drifting sprays"
+msgid "Drifting spray"
 msgstr "Skriv med grånyansar"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "&Helsingstekst:"
 
 #. DUST
-#: my-evolution/metar.c:116
-#, fuzzy
+#: my-evolution/metar.c:367
 msgid "Dust"
-msgstr "Gjest"
+msgstr "Støv"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 #, fuzzy
 msgid "Light dust"
 msgstr "Lyse felt"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 #, fuzzy
 msgid "Moderate dust"
 msgstr "moderert"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 #, fuzzy
 msgid "Heavy dust"
 msgstr "Emneliste"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 #, fuzzy
 msgid "Patches of dust"
 msgstr "pakkar ut"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 #, fuzzy
 msgid "Blowing dust"
 msgstr "Blinkande prikkar"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 #, fuzzy
 msgid "Drifting dust"
 msgstr "Skriv dokument"
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 #, fuzzy
 msgid "Squall"
 msgstr "Lite"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 #, fuzzy
 msgid "Light squall"
 msgstr "Lista er full"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 #, fuzzy
 msgid "Partial squall"
 msgstr "Parallell"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 #, fuzzy
 msgid "Sandstorm"
 msgstr "Omdann"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 #, fuzzy
 msgid "Moderate sandstorm"
 msgstr "Fjernare"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 #, fuzzy
 msgid "Shallow sandstorm"
 msgstr "Vis sekund"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 #, fuzzy
 msgid "Partial sandstorm"
 msgstr "Marshalløyane"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 #, fuzzy
 msgid "Thunderous sandstorm"
 msgstr "Skiljeteikn for tusental:"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 #, fuzzy
 msgid "Blowing sandstorm"
 msgstr "&Under redigeringsvindauget"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 #, fuzzy
 msgid "Duststorm"
 msgstr "tilpassa"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 #, fuzzy
 msgid "Light duststorm"
 msgstr "Høgre knapp"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 #, fuzzy
 msgid "Moderate duststorm"
 msgstr "Fjernare"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 #, fuzzy
 msgid "Blowing duststorm"
 msgstr "Blinkande prikkar"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 #, fuzzy
 msgid "Shallow funnel cloud"
 msgstr "Vis &linjetal"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
-#, fuzzy
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
-msgstr "Tonga"
+msgstr "Tornado"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 #, fuzzy
 msgid "Moderate tornado"
 msgstr "moderert"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 #, fuzzy
 msgid "Raging tornado"
 msgstr "Kan ikkje angra"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 #, fuzzy
 msgid "Partial tornado"
 msgstr "Partisjonar"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 #, fuzzy
 msgid "Drifting tornado"
 msgstr "Utskriftsmetode"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 #, fuzzy
 msgid "Freezing tornado"
 msgstr "Skrifttype for helsing"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 #, fuzzy
 msgid "Shallow dust whirls"
 msgstr "Vis detaljar"
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -12203,7 +12281,7 @@ msgstr "Fjern"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Legg til nytt bilete"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -12221,14 +12299,13 @@ msgstr "Alle kantar"
 msgid "All news _feeds:"
 msgstr "&Alle felt"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "M_etric"
-msgstr "Geometrisk"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
@@ -12276,14 +12353,13 @@ msgid "Show _today's tasks"
 msgstr "Vedlegg"
 
 #: my-evolution/my-evolution.glade.h:18
-#, fuzzy
-msgid "Tasks "
-msgstr "Oppgåver"
+msgid "Show temperatures in:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Units: "
-msgstr "Einingar"
+msgid "Tasks "
+msgstr "Oppgåver"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
@@ -12306,14 +12382,13 @@ msgid "_Displayed feeds:"
 msgstr "Vist namn:"
 
 #: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "_Five days"
-msgstr " dagar"
+msgid "_Fahrenheit"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "_Imperial"
-msgstr "seriell"
+msgid "_Five days"
+msgstr " dagar"
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
@@ -12355,40 +12430,41 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "&Avbryt operasjon"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:175
+#, fuzzy
 msgid "Outbox"
-msgstr ""
+msgstr "Utboks"
 
-#: shell/e-local-storage.c:624
+#: shell/e-local-storage.c:636
 #, fuzzy
 msgid "Local Folders"
 msgstr "Mapper"
 
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 #, fuzzy
 msgid "Evolution installation"
 msgstr "KDeelop-installering"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -12398,14 +12474,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "Ein feil oppstod ved lagring."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -12413,7 +12489,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -12422,7 +12498,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -12430,6 +12506,20 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Opphavsrett (c), %1 1997-2000"
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
@@ -12445,61 +12535,67 @@ msgstr "kan ikkje opna fila %1"
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 #, fuzzy
 msgid "Copy folder"
 msgstr "Kopier til mappe"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 #, fuzzy
 msgid "Move folder"
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:386
+#: shell/e-shell-folder-commands.c:385
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:402
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Slett"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Er du sikker på at du vil sletta denne mappa?"
 
-#: shell/e-shell-folder-commands.c:457
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:490
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-commands.c:493
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Endra namn på profil '%1'"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Arkivfilnamnet er ikkje gyldig.\n"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
@@ -12509,56 +12605,31 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Gå til side"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Arkivfilnamnet er ikkje gyldig.\n"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "Lagar ei ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -12567,13 +12638,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr ""
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12581,205 +12652,194 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Fila finst ikkje\n"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Det er ikkje band i stasjonen."
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 #, fuzzy
 msgid "Importing"
 msgstr "Flyttar"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:560
-#, fuzzy
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:611
-#, fuzzy
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:616
-#, fuzzy
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
-msgstr "Signaturfil:"
+msgstr "Vel fil"
 
-#: shell/e-shell-importer.c:626
-#, fuzzy
+#: shell/e-shell-importer.c:627
 msgid "File type:"
-msgstr "Filnamn:"
+msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "Flyttar"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "Frå:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
+#, fuzzy
 msgid "Import"
-msgstr ""
+msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 #, fuzzy
 msgid "Closing connections..."
 msgstr "Lukkar prosjekt ..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
-msgid "Ximian Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:237
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Opphavsrett (c), %1 1997-2000"
-
-#: shell/e-shell-view-menu.c:239
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
+msgid "About Ximian Evolution"
+msgstr "Oppløysing"
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:563
+#: shell/e-shell-view-menu.c:530
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
+#: shell/e-shell-view-menu.c:570
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: shell/e-shell-view-menu.c:705
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
-msgid "Work Online"
+msgid "_Work Online"
 msgstr "Flyttar"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Flyttar"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 #, fuzzy
 msgid "Work Offline"
 msgstr "Flyttar"
@@ -12788,46 +12848,36 @@ msgstr "Flyttar"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1592
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1594
 #, fuzzy
 msgid "(None)"
 msgstr "(ingen)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "Evalueringsfeil"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "Evalueringsfeil"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1641
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1648
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1654
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:651
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12835,244 +12885,342 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
+#, fuzzy
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ugyldig(e) argument"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Endra snarveg for:"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, fuzzy, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 #, fuzzy
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 #, fuzzy
 msgid "_Small Icons"
 msgstr "Små ikon"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsnøggtastar"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Endra portnamn"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "&Merka tekst"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "&Opna i eige vindauge"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "_Rename"
 msgstr "Omdøyp"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 #, fuzzy
 msgid "Re_move"
 msgstr "Fjern"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:499
-#, fuzzy
+#: shell/e-storage.c:498
 msgid "No error"
-msgstr "Ingen feil."
+msgstr "Ingen feil"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip å senda."
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr ""
+
+#: shell/e-storage.c:512
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje støtta på tenar"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:522
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+#, fuzzy
+msgid "Cannot create a folder with that name"
+msgstr "Leitar etter tilleggsmodular"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
+#: shell/evolution-shell-component.c:973
+#, fuzzy
+msgid "CORBA error"
+msgstr "IU-feil"
+
+#: shell/evolution-shell-component.c:975
+msgid "Interrupted"
+msgstr ""
+
+#: shell/evolution-shell-component.c:977
+#, fuzzy
+msgid "Invalid argument"
+msgstr "(ugyldig)"
+
+#: shell/evolution-shell-component.c:979
+msgid "Already has an owner"
+msgstr ""
+
+#: shell/evolution-shell-component.c:981
+#, fuzzy
+msgid "No owner"
+msgstr "Ingen"
+
+#: shell/evolution-shell-component.c:983
+#, fuzzy
+msgid "Not found"
+msgstr "Fann ikkje fil"
+
+#: shell/evolution-shell-component.c:985
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Vel modemtype ..."
+
+#: shell/evolution-shell-component.c:987
+msgid "Unsupported schema"
+msgstr ""
+
+#: shell/evolution-shell-component.c:989
+msgid "Unsupported operation"
+msgstr "Ustøtta operasjon"
+
+#: shell/evolution-shell-component.c:991
+msgid "Internal error"
+msgstr "Intern feil"
+
+#: shell/evolution-shell-component.c:995
+msgid "Exists"
+msgstr "Eksisterar"
+
+#: shell/evolution-shell-component.c:997
+msgid "Invalid URI"
+msgstr "Ugyldig URI"
+
+#: shell/evolution-shell-component.c:1001
+#, fuzzy
+msgid "Has subfolders"
+msgstr "Vidaresendt melding"
+
+#: shell/evolution-shell-component.c:1003
+#, fuzzy
+msgid "No space left"
+msgstr "Ingen rektangel valt!"
+
+#: shell/evolution-shell-component.c:1005
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Ukjend feil"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active connections"
@@ -13177,32 +13325,32 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 #, fuzzy
 msgid "Importers"
 msgstr "Im&portar"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 #, fuzzy
 msgid "Don't import"
 msgstr "fjern"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "Ikkje spør igjen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Bruk på følgjande delar:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Skriftinnstillingar"
 
-#: shell/main.c:162
+#: shell/main.c:193
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -13219,45 +13367,67 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:183
+#: shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:236
+#: shell/main.c:268
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:245
+#: shell/main.c:277
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:301
+#: shell/main.c:347
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:302
+#: shell/main.c:348
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:344
+#: shell/main.c:390
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Opna fil"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Set inn fil"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Gå til side"
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopier"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
-#, fuzzy
 msgid "Copy the selection"
-msgstr "Slettar den valte fila"
+msgstr "Kopier vald område"
 
 #: ui/evolution-addressbook.xml.h:4
 #, fuzzy
@@ -13274,9 +13444,8 @@ msgid "Cut"
 msgstr "Klipp ut"
 
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
-#, fuzzy
 msgid "Cut the selection"
-msgstr "Slettar den valte fila"
+msgstr "Klipp ut valde område"
 
 #: ui/evolution-addressbook.xml.h:9
 #, fuzzy
@@ -13293,9 +13462,8 @@ msgid "Paste"
 msgstr "Lim inn"
 
 #: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
-#, fuzzy
 msgid "Paste the clipboard"
-msgstr "Limer inn ..."
+msgstr "Lim inn frå utklippstavla"
 
 #: ui/evolution-addressbook.xml.h:15
 #, fuzzy
@@ -13343,9 +13511,8 @@ msgid "Send selected contacts to another person."
 msgstr "Lagra side til ascii-fil"
 
 #: ui/evolution-addressbook.xml.h:27
-#, fuzzy
 msgid "Stop"
-msgstr "Poengsum"
+msgstr "Stopp"
 
 #: ui/evolution-addressbook.xml.h:28
 #, fuzzy
@@ -13356,11 +13523,10 @@ msgstr "Lagring"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
-#, fuzzy
 msgid "_Actions"
-msgstr "Handlingar"
+msgstr "_Handlingar"
 
 #: ui/evolution-addressbook.xml.h:30
 #, fuzzy
@@ -13383,11 +13549,10 @@ msgid "_Forward Contact..."
 msgstr "&Innhald ..."
 
 #: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
-#, fuzzy
 msgid "_Print..."
-msgstr "Skriv ut"
+msgstr "_Skriv ut ..."
 
 #: ui/evolution-addressbook.xml.h:38
 #, fuzzy
@@ -13400,9 +13565,8 @@ msgid "_Search for Contacts"
 msgstr "Slett kolonne"
 
 #: ui/evolution-addressbook.xml.h:40
-#, fuzzy
 msgid "_Select All"
-msgstr "Vel mappe"
+msgstr "_Vel alt"
 
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
@@ -13436,10 +13600,9 @@ msgstr "Dag"
 msgid "Delete the appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
-#, fuzzy
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
-msgstr "Gå til side"
+msgstr "Gå til"
 
 #: ui/evolution-calendar.xml.h:14
 #, fuzzy
@@ -13476,9 +13639,8 @@ msgid "New Appointment"
 msgstr "&Vis avtale ..."
 
 #: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-#, fuzzy
 msgid "New Task"
-msgstr "Oppgåve"
+msgstr "Ny oppgåve"
 
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
@@ -13486,9 +13648,8 @@ msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
 #: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#, fuzzy
 msgid "Print Pre_view"
-msgstr "&Førehandsvising ..."
+msgstr "Førehands_vising av utskrift"
 
 #: ui/evolution-calendar.xml.h:26
 #, fuzzy
@@ -13578,15 +13739,15 @@ msgid "Print this item"
 msgstr "Skriv til fil"
 
 #: ui/evolution-comp-editor.xml.h:11
-#, fuzzy
 msgid "Print..."
-msgstr "Skriv ut"
+msgstr "Skriv ut ..."
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
+#, fuzzy
 msgid "Save"
-msgstr "Lagra"
+msgstr "Lagre"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #, fuzzy
@@ -13608,9 +13769,8 @@ msgstr "Lagra til disk"
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
-#, fuzzy
 msgid "_File"
-msgstr "Fil"
+msgstr "_Fil"
 
 #: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
@@ -13620,9 +13780,8 @@ msgstr "Private meldingar"
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
-#, fuzzy
 msgid "Save _As..."
-msgstr "Lagra som ..."
+msgstr "Lagre _som ..."
 
 #: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
@@ -13632,9 +13791,8 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-signature-editor.xml.h:10
-#, fuzzy
 msgid "_Save"
-msgstr "Lagra"
+msgstr "_Lagre"
 
 #: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
@@ -13705,10 +13863,6 @@ msgstr "Køyreplan ..."
 msgid "Customise My Evolution"
 msgstr "Evalueringsfeil"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -13732,9 +13886,8 @@ msgid "Create or edit virtual folder definitions"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:7
-#, fuzzy
 msgid "Empty _Trash"
-msgstr " dag"
+msgstr "Tøm _papirkorga"
 
 #: ui/evolution-mail-global.xml.h:8
 #, fuzzy
@@ -13782,9 +13935,8 @@ msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
 #: ui/evolution-mail-global.xml.h:19
-#, fuzzy
 msgid "_Filters..."
-msgstr "E-post:"
+msgstr "_Filter ..."
 
 #: ui/evolution-mail-global.xml.h:20
 #, fuzzy
@@ -13822,9 +13974,8 @@ msgid "Copy selected messages"
 msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Cu_t"
-msgstr "Klipp ut"
+msgstr "K_lipp"
 
 #: ui/evolution-mail-list.xml.h:4
 #, fuzzy
@@ -13872,9 +14023,8 @@ msgid "Permanently remove all deleted messages from this folder"
 msgstr "Kontroller stavinga til alle dei omsette programtekstane i fila."
 
 #: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
-#, fuzzy
 msgid "Select _All"
-msgstr "Vel mappe"
+msgstr "Vel _alt"
 
 #: ui/evolution-mail-list.xml.h:14
 #, fuzzy
@@ -13922,9 +14072,8 @@ msgid "_Expunge"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#, fuzzy
 msgid "_Folder"
-msgstr "Mapper"
+msgstr "_Mappe"
 
 #: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 #, fuzzy
@@ -13932,9 +14081,8 @@ msgid "_Invert Selection"
 msgstr "Slettar den valte fila"
 
 #: ui/evolution-mail-list.xml.h:30
-#, fuzzy
 msgid "_Properties..."
-msgstr "Eigenskapar ..."
+msgstr "Ei_genskapar ..."
 
 #: ui/evolution-mail-list.xml.h:31
 #, fuzzy
@@ -14008,345 +14156,372 @@ msgstr "Mapper"
 msgid "Create a virtual folder for this subject"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Display the next message"
 msgstr "Vis åtvaringsmelding"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the next unread thread"
 msgstr "Neste ulesne &tråd"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
+#, fuzzy
 msgid "Forward"
-msgstr "Fram"
+msgstr "Framover"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward As"
 msgstr "Fram"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "Smarte vedlegg"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "Fram"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Send vidare til"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Sett inn fil ..."
+
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Load _Images"
 msgstr "Endra &biletestorleik"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:49
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
-msgstr "Mån"
+msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Next Important Message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:53
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
-msgstr "Legg til melding"
+msgstr "Neste melding"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next Thread"
 msgstr "Vel mappe"
 
-#: ui/evolution-mail-message.xml.h:55
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
-msgstr "Ulest melding"
+msgstr "Neste uleste melding"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Kopierer det merkte området til utklippstavla"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
-msgstr "Førre"
+msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Previous Important Message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:61
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
-msgstr "Private meldingar"
+msgstr "Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Previous Unread Message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Print this message"
 msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Søk i &meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
 msgid "Setup the page settings for your current printer"
-msgstr ""
+msgstr "Endre sideoppsett for gjeldande skrivar"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "E-posttenar"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Vis &heile meldingshovudet"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Lag meldingar og slå saman"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Rediger fil"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "_Larger"
+msgstr "Personsøkjar"
+
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Message Display"
 msgstr "Endra tidsvising"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send melding"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
-#, fuzzy
 msgid "_Tools"
-msgstr "Verktøy"
+msgstr "_Verkty"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
@@ -14357,15 +14532,13 @@ msgstr "&Slett avtale"
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
-#, fuzzy
 msgid "_Close"
-msgstr "Lukk"
+msgstr "_Lukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
-#, fuzzy
 msgid "_View"
-msgstr "Vis"
+msgstr "_Vis"
 
 #: ui/evolution-message-composer.xml.h:1
 #, fuzzy
@@ -14373,9 +14546,8 @@ msgid "Attach"
 msgstr "&Legg ved"
 
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
-#, fuzzy
 msgid "Close the current file"
-msgstr "tid no"
+msgstr "Lukk gjeldande fil"
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
@@ -14392,12 +14564,12 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-#, fuzzy
 msgid "F_ormat"
-msgstr "Format"
+msgstr "F_ormat"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -14416,9 +14588,8 @@ msgid "Insert text file..."
 msgstr "Sett inn fil ..."
 
 #: ui/evolution-message-composer.xml.h:14
-#, fuzzy
 msgid "Open a file"
-msgstr "Opna fil"
+msgstr "Opne ei fil"
 
 #: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
@@ -14438,9 +14609,8 @@ msgid "S/MIME Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "Save As"
-msgstr "Lagra"
+msgstr "Lagra som"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
@@ -14453,14 +14623,12 @@ msgstr "Lagrar fil ..."
 
 #: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
-#, fuzzy
 msgid "Save the current file"
-msgstr "tid no"
+msgstr "Lagre gjeldande fil"
 
 #: ui/evolution-message-composer.xml.h:25
-#, fuzzy
 msgid "Save the current file with a different name"
-msgstr "Sender ei melding til ein nettverksspelar"
+msgstr "Lagre gjeldane fil med eit anna namn"
 
 #: ui/evolution-message-composer.xml.h:26
 #, fuzzy
@@ -14561,14 +14729,12 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:9
-#, fuzzy
 msgid "_Insert"
-msgstr "Set inn"
+msgstr "Set _inn"
 
 #: ui/evolution-message-composer.xml.h:51
-#, fuzzy
 msgid "_Open..."
-msgstr "Opna ..."
+msgstr "_Opne ..."
 
 #: ui/evolution-message-composer.xml.h:52
 #, fuzzy
@@ -14580,9 +14746,8 @@ msgid "_Security"
 msgstr ""
 
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
-#, fuzzy
 msgid "_Help"
-msgstr "Heim"
+msgstr "_Hjelp"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
@@ -14594,8 +14759,9 @@ msgid "F_older"
 msgstr "Mapper"
 
 #: ui/evolution-subscribe.xml.h:3
+#, fuzzy
 msgid "Refresh List"
-msgstr ""
+msgstr "Frisk &opp liste"
 
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
@@ -14606,13 +14772,12 @@ msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
 #: ui/evolution-subscribe.xml.h:7
-#, fuzzy
 msgid "Subscribe"
-msgstr "Kjelder"
+msgstr "Abonner"
 
 #: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Stopp abonnement"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
@@ -14722,9 +14887,8 @@ msgid "Display a different folder"
 msgstr ""
 
 #: ui/evolution.xml.h:12
-#, fuzzy
 msgid "E_xit"
-msgstr "Avslutt"
+msgstr "_Avslutt"
 
 #: ui/evolution.xml.h:13
 #, fuzzy
@@ -14732,8 +14896,9 @@ msgid "Evolution _Window"
 msgstr "Evolution"
 
 #: ui/evolution.xml.h:14
+#, fuzzy
 msgid "Exit the program"
-msgstr ""
+msgstr "Avslutt programmet"
 
 #: ui/evolution.xml.h:15
 msgid "Import data from other programs"
@@ -14803,9 +14968,8 @@ msgid "_About Ximian Evolution..."
 msgstr "Oppløysing"
 
 #: ui/evolution.xml.h:34
-#, fuzzy
 msgid "_Copy..."
-msgstr "&Kopier ..."
+msgstr "_Kopier ..."
 
 #: ui/evolution.xml.h:38
 #, fuzzy
@@ -14818,9 +14982,8 @@ msgid "_Go to Folder..."
 msgstr "Flytt til mappe"
 
 #: ui/evolution.xml.h:41
-#, fuzzy
 msgid "_Import..."
-msgstr "Flyttar"
+msgstr "_Importer ..."
 
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -14828,9 +14991,8 @@ msgid "_Move..."
 msgstr "&Flytt ..."
 
 #: ui/evolution.xml.h:43
-#, fuzzy
 msgid "_New"
-msgstr "Vis"
+msgstr "_Ny"
 
 #: ui/evolution.xml.h:44
 #, fuzzy
@@ -14856,11 +15018,6 @@ msgstr "Snarveg"
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Work Offline"
-msgstr "Flyttar"
-
 #: ui/my-evolution.xml.h:1
 #, fuzzy
 msgid "Change the settings for the summary"
@@ -14872,9 +15029,8 @@ msgid "Print summary"
 msgstr "oppsummering"
 
 #: ui/my-evolution.xml.h:5
-#, fuzzy
 msgid "Reload"
-msgstr "Tilfeldig"
+msgstr "Last om att"
 
 #: ui/my-evolution.xml.h:6
 msgid "Reload the view"
@@ -14945,186 +15101,178 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 #, fuzzy
 msgid "_Current View"
 msgstr "tid no"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 #, fuzzy
 msgid "Define Views"
 msgstr "Detaljert oversikt"
 
 #. 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:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 #, fuzzy
 msgid "%B %Y"
 msgstr "%1 %2"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
-#, fuzzy
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
-msgstr "&No"
+msgstr "No"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
-#, fuzzy
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
-msgstr "i dag"
+msgstr "I dag"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:769
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ein bandindeks må vera valt i treet."
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Sentraleuropeisk"
 
-#: widgets/misc/e-charset-picker.c:61
-#, fuzzy
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
-msgstr "Name=Kinesisk"
+msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Gresk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
+#, fuzzy
 msgid "Turkish"
-msgstr ""
+msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Vesteuropeisk"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 #, fuzzy
 msgid "Traditional"
 msgstr "Tradisjonell KMail"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 #, fuzzy
 msgid "Simplified"
 msgstr "Forenkla kinesisk"
 
-#: widgets/misc/e-charset-picker.c:91
-#, fuzzy
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
-msgstr "Brasiliansk"
+msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:102
-#, fuzzy
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
-msgstr "Ny ..."
+msgstr "Ny"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "&Bruk sitatteikn på ukjende teikn"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 #, fuzzy
 msgid "Enter the character set to use"
 msgstr "Oppgi teiknsett"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Andre ..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 #, fuzzy
 msgid "Character Encoding"
 msgstr "Datakoding"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Search Editor"
 msgstr "Comment=X-redigering"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 #, fuzzy
 msgid "Save Search"
 msgstr "Søk"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Søk"
 
-#: widgets/misc/e-filter-bar.h:95
-#, fuzzy
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
-msgstr "Skriv ut alle"
+msgstr "Tøm"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr ""
 
 #: widgets/misc/e-messagebox.c:152
-#, fuzzy
 msgid "Information"
 msgstr "Informasjon"
 
 #: widgets/misc/e-messagebox.c:166
-#, fuzzy
 msgid "Error"
-msgstr "Ingen feil."
+msgstr "Feil"
 
 #: widgets/misc/e-messagebox.c:173
-#, fuzzy
 msgid "Question"
-msgstr "Skildring:"
+msgstr "Spørsmål"
 
 #: widgets/misc/e-messagebox.c:180
-#, fuzzy
 msgid "Message"
-msgstr "Legg til melding"
+msgstr "Melding"
 
 #. Add the "Don't show this message again." checkbox
 #: widgets/misc/e-messagebox.c:224
-#, fuzzy
 msgid "Don't show this message again."
-msgstr "Sen melding"
+msgstr "Ikkje vis denne meldinga igjen"
 
 #: widgets/misc/e-search-bar.c:334
-#, fuzzy
 msgid "Sear_ch"
-msgstr "Søk"
+msgstr "_Søk"
 
 #: widgets/misc/e-search-bar.c:460
-#, fuzzy
 msgid "Find Now"
-msgstr "Finn:"
+msgstr "Finn no"
 
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
@@ -15139,22 +15287,115 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:200
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:212
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:225
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
 #, fuzzy
+#~ msgid "_Invite Others"
+#~ msgstr "Andre ..."
+
+#, fuzzy
+#~ msgid "GnomeCard:"
+#~ msgstr "Teikn"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "kan ikkje opna fila %1"
+
+#, fuzzy
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Informasjon om deg og omsetjingslaget"
+
+#, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "&Endra avtale ..."
+
+#, fuzzy
+#~ msgid "Notification about your task"
+#~ msgstr "Påminning"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Ukjend feil"
+
+#, fuzzy
+#~ msgid "_Confidential"
+#~ msgstr "Eksponentiell"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Skildring:"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Synkroniser"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr ""
+#~ "Kunne ikkje laga mellombels fil\n"
+#~ "%1:\n"
+#~ "%2"
+
+#, fuzzy
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Ingen bilete tilgjengeleg."
+
+#, fuzzy
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Endra tidsvising"
+
+#, fuzzy
+#~ msgid "Encrypted message"
+#~ msgstr "Lagra melding"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
+
+#, fuzzy
+#~ msgid "M_etric"
+#~ msgstr "Geometrisk"
+
+#, fuzzy
+#~ msgid "Units: "
+#~ msgstr "Einingar"
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "seriell"
+
+#, fuzzy
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr ""
+#~ "Kan ikkje laga heimekatalog\n"
+#~ "Feil: %1"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "Evalueringsfeil"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "Evalueringsfeil"
+
+#, fuzzy
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Oppgi ditt OpenPGP-passord"
 
@@ -15178,10 +15419,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ "%2"
 
 #, fuzzy
-#~ msgid "_Calendar Information:"
-#~ msgstr "Informasjon"
-
-#, fuzzy
 #~ msgid "before start of appointment"
 #~ msgstr "&Slett avtale"
 
@@ -15286,17 +15523,14 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgid "u"
 #~ msgstr "Sum"
 
-#, fuzzy
 #~ msgid "x"
-#~ msgstr "Tx"
+#~ msgstr "x"
 
-#, fuzzy
 #~ msgid "y"
-#~ msgstr "av"
+#~ msgstr "y"
 
-#, fuzzy
 #~ msgid "z"
-#~ msgstr "Hz"
+#~ msgstr "z"
 
 #~ msgid "Done."
 #~ msgstr "Ferdig."
@@ -15348,10 +15582,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ "%2"
 
 #, fuzzy
-#~ msgid "%x"
-#~ msgstr "Tx"
-
-#, fuzzy
 #~ msgid "Elm mail"
 #~ msgstr "E-post 2"
 
@@ -15360,10 +15590,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Ny e-post"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Øydelagd oppsettfil."
-
-#, fuzzy
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Vidaresendt melding frå %1"
 
@@ -15472,13 +15698,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Delegert"
 
 #, fuzzy
-#~ msgid "No one"
-#~ msgstr "Ingen"
-
-#~ msgid "Task"
-#~ msgstr "Oppgåve"
-
-#, fuzzy
 #~ msgid "% Comp_lete:"
 #~ msgstr "Ferdig"
 
@@ -15703,10 +15922,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Comment=X-redigering"
 
 #, fuzzy
-#~ msgid "_Index"
-#~ msgstr "Set inn"
-
-#, fuzzy
 #~ msgid "_Mail message"
 #~ msgstr "Legg til melding"
 
@@ -15769,13 +15984,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgid "TasksPreferences"
 #~ msgstr "Innstillingar"
 
-#~ msgid "File not found"
-#~ msgstr "Fann ikkje fil"
-
-#, fuzzy
-#~ msgid "Open calendar"
-#~ msgstr "Feil ved opning"
-
 #, fuzzy
 #~ msgid "Save calendar"
 #~ msgstr "Ny kalender"