Update the po files to cut down on dist time

02-05-08 JP Rosevear <jpr@ximian.com> * Update the po files to cut down on dist time svn path=/trunk/; revision=16721
author: JP Rosevear <jpr@ximian.com> 2002-05-08 21:37:33 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2002-05-08 21:37:33 +0800
commit: b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree: 5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/nn.po
parent: d02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
download: gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip
1 files changed, 5825 insertions, 4214 deletions
diff --git a/po/nn.po b/po/nn.po
index 29c9c4a900..8f92ccd88c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-1.01\n"
-"POT-Creation-Date: 2002-01-30 06:12+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-01-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \n"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer inn i Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:960
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "Arkiver som"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:962
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Primary"
 msgstr "Primær"
 
@@ -54,16 +55,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
 msgid "Business"
 msgstr "Firma"
 
@@ -73,12 +74,12 @@ msgid "Bus"
 msgstr "Frm"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+#: addressbook/gui/contact-editor/e-contact-editor.c:1720
 msgid "Callback"
 msgstr "Ring tilbake"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: addressbook/gui/contact-editor/e-contact-editor.c:1722
 msgid "Company"
 msgstr "Firma"
 
@@ -89,13 +90,13 @@ msgstr "Frm"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
 msgid "Home"
 msgstr "Heim"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -105,19 +106,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1727
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/gui/contact-editor/e-contact-editor.c:1721
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Firma-fax"
 
@@ -126,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Frm-fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Heime-faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid "Business 2"
 msgstr "Firma 2"
 
@@ -141,69 +142,68 @@ msgid "Bus 2"
 msgstr "Frm 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1652
+#: addressbook/gui/contact-editor/e-contact-editor.c:1724
 msgid "Home 2"
 msgstr "Heim 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1654
-#: addressbook/gui/widgets/e-addressbook-view.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1786
 msgid "Other"
 msgstr "Anna"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: addressbook/gui/widgets/e-addressbook-view.c:980
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Personsøkjar"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:984
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1687
-#: addressbook/gui/widgets/e-addressbook-view.c:986
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:988
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Nettstad"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:989
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "Avdeling"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:990
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "Kontor"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Av"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:991
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "Tittel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:992
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "Yrke"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:993
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "Sjef"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:995
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "Kallenamn"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Kallenamn"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:996
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "Ektefelle"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:997
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "Merknad"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:998
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr "Ledit-oppteke URL"
 
@@ -313,300 +313,16 @@ msgstr "Kategoriar"
 msgid "Family Name"
 msgstr "Etternamn"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "Kort: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Namn: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  Prefiks:    "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  Fornamn:    "
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  Tillegg:"
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  Etternamn:  "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  Etterstaving:    "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Fødselsdato: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Adresse:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  Postboks:"
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  Prefix:    "
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Gateaddresse:"
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  By:          "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Region:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Postnummer: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Land:        "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"Leveringsetikett: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefonar:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefon:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"E-post:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"E-post:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Tidssone:"
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"Geo lokasjon: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"Forretningsrolle: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"Org: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Namn:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-" Eining: "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-" Eining2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-" Eining3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-" Eining4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"Kategoriar: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Merknad:"
-
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue (string, _ ("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string (string, _ ("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType (string, crd->sound.type);
-#. }
-#: addressbook/backend/ebook/e-card.c:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"Unik streng:"
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Offentleg nøkkel: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
@@ -614,86 +330,89 @@ msgstr "VKort for %s"
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: 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:1721
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1316
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Søkjer ..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Lastar ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
+#: addressbook/backend/pas/pas-backend-file.c:272
 msgid "Error in search expression."
 msgstr "Feil i søkeuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "Koplar til LDAP-tenar ..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "Klarte ikkje å kople til LDAP-tenar."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "Ventar på å kople til LDAP-tenar ..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Legg til kort til LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Fjernar kort frå LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Endrar kort frå LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Startar søk om att."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Mottek LDAP-søkeresultat ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "Startar søk om att."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Feil ved fjerning av kort"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Klarter ikkje å tolke URL frå «%s»"
 
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "E-postadresse:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Markør kunne ikkje lastast\n"
 
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "EBook vart ikkje lasta\n"
 
-#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1354
 #: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:824
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Klarte ikkje å starte wombat-tenar."
 
-#: addressbook/conduit/address-conduit.c:1221
+#: addressbook/conduit/address-conduit.c:1355
 #: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:825
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Klarte ikkje å starte wombat."
 
-#: addressbook/conduit/address-conduit.c:1251
-#: addressbook/conduit/address-conduit.c:1254
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
@@ -706,358 +425,835 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Ein bonobo-kontroll for vising av addresser."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Ein eksempel Bonobo-kotroll som viser ein addressebok."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Addressebokkjelder"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Configuration control for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser eit Evolution addressebok minikort."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolutions addressebok minikortlesar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Evolutionkomponent for handsaming av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrikk for Minikortkontrolle i addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrikk for addressevisaren til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrikke for sprettopp-vindauget til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrikk for ein eksemple adressebokkontroll"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: 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
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Mappe som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "Ny _kontakt"
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "Ny kontakt_liste"
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Contact _List"
+msgstr "&Innhald ..."
+
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "Klarte ikkje å initialisere gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "Ikkje i stand å opne adresseboka"
+
+#: addressbook/gui/component/addressbook.c:525
+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:530
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:538
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Oppgi passord for %s (brukar %s)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "sluttar med"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "E-post 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategori er"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Nokon felt inneheld"
+
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+msgid "Advanced..."
+msgstr "Avansert ..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Nokon kategori"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+msgid "Primary Email"
+msgstr "Primær e-post"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Vel ei handling"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Lag ny kontakt «%s»"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Legg til addresser for eksisterande kontakt «%s»"
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Spør adresseboka ..."
+
+#: 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 "Rediger kontaktinformasjon"
+
+#: 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
+msgid "Add to Contacts"
+msgstr "Legg til kontakter"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Flett e-postadresser"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Slå av spørjingar"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
+msgstr "Slå på spørjingar (Farleg!)"
+
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Klarte ikkje å kople til LDAP-tenar."
+
+#: addressbook/gui/component/addressbook-config.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Ikkje i stand til å autentisere mot IMAP-tenar.\n"
+"%s\n"
 
-#: addressbook/gui/component/addressbook-config.c:193
-msgid "Edit Addressbook"
-msgstr "Rediger adressebok"
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1163
+#, fuzzy
+msgid "Could not query for schema information"
+msgstr "Les filinformasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1613
 #, fuzzy
-msgid "100"
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Fullføringsdato"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "Vel modemtype ..."
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Val"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Fje_rn"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Account Name"
-msgstr "Kontonamn"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Add Addressbook"
-msgstr "Legg til adressebok"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Addressebokkjelder"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Advanced"
-msgstr "Avansert"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmar"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonym"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Enkel"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Connecticut"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Ingen informasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "S_lett"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Liste_namn:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution alarm"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
+"ovanfor tenaren"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
 "ovanfor tenaren"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "F_inn"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Allment"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Oppsett"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Margar"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_kvar"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "One"
 msgstr "Ein"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search _base:"
-msgstr "Søke_base:"
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "Forvald"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Forvald"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Søkes_kop:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Server Name"
-msgstr "Tenarnamn"
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:50
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
+#: calendar/gui/e-week-view.c:1213
+msgid "Searching"
+msgstr "Søker"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Vel alle"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Sletta"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Tenarinformasjon"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr " Koplar til tenar ..."
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Informasjon trengs for å legge til ei addressebok."
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Ustøtta skjema"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+msgid ""
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "This information is not required for most ldap servers. "
-msgstr "Denne informasjonen er ikkje naudsynt for dei fleste ldap-tenarer."
+#: addressbook/gui/component/ldap-config.glade.h:73
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 msgstr ""
-"Denne informasjonen er brukt av ldap-tenaren for å spesifierse kva nodar som "
-"skal brukast i søket. Kontakt tenaradmistratoren din for meir informasjon."
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This is the name of the server where your addressbook is located."
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:88
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"\n"
+"too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 msgstr ""
 "Namnet blir brukt til å identifisere kontoen din. Det er kun til for "
 "visningsføremål."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
-msgid "_Account name:"
-msgstr "Konton_amn:"
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"\n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "E-postadresse:"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: 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:99 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Download Limit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:107
-#: ui/evolution-addressbook.xml.h:35 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
-msgid "_Edit"
-msgstr "R_edigér"
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid "_My server requires authentication"
-msgstr "_Min tenar treng autentisering"
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Legg til handling"
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Port:"
-msgstr "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Legg til handling"
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
-msgid "_Server name:"
-msgstr "_Tenarnamn:"
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmar"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "Klarte ikkje å initialisere gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "S_lett alle"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Andre kontakter"
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Vis"
 
-#: addressbook/gui/component/addressbook.c:499
-msgid "Unable to open addressbook"
-msgstr "Ikkje i stand å opne adresseboka"
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
-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"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:513
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:521
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:28 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:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "R_edigér"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "R_edigér avtale"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution alarm"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:654
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Oppgi passord for %s (brukar %s)"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:822
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Nokon felt inneheld"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:823
-msgid "Name contains"
-msgstr "Namn inneheld"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:824
-msgid "Email contains"
-msgstr "E-post inneheld"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Val"
 
-#: addressbook/gui/component/addressbook.c:825
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Kategori er"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Port:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:826 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avansert ..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Forvald"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1053
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Nokon kategori"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Søke_base:"
 
-#: addressbook/gui/component/addressbook.c:1136
-msgid "The URI that the Folder Browser will display"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "_Tenarnamn:"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(ingen)"
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Låg grense (minutt):"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
-msgid "Primary Email"
-msgstr "Primær e-post"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Konto %d"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Vel ei handling"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "contact-list-editor"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Lag ny kontakt «%s»"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Ingen kort"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Legg til addresser for eksisterande kontakt «%s»"
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Koplar til %s på nytt"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "Spør adresseboka ..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: 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 "Rediger kontaktinformasjon"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: 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
-msgid "Add to Contacts"
-msgstr "Legg til kontakter"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Allment"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Flett e-postadresser"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Slå av spørjingar"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Slå på spørjingar (Farleg!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Søker"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #, fuzzy
@@ -1069,9 +1265,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:830
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:980
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
+#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1100,7 +1296,12 @@ msgstr "(%d ikkje vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Avsendar inneheld"
+
+#: addressbook/gui/component/select-names/e-select-names.c:716
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1110,7 +1311,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:589
+#: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1118,31 +1319,40 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:671
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "I_nneheld:"
+msgid "Select Names"
+msgstr "Vel namn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "F_inn"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Slett kontakt?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Vel namn"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Kontakter"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Vis kontakter som stemmer med desse kriteria:"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "_Flytt ..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mapper:"
 
@@ -1178,7 +1388,7 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1365
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1203,10 +1413,6 @@ msgstr "Arkiver _som:"
 msgid "Full _Name..."
 msgstr "Fullt _namn ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Allment"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1248,10 +1454,11 @@ msgstr "Vil motta _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:105
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
+#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1279,35 +1486,1054 @@ msgstr "_Offentleg kalendar-URL:"
 msgid "_Web page address:"
 msgstr "_Nettsideaddresse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-" slette denne kontakta?"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2343
+msgid "United States"
+msgstr "USA"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:42
+msgid "Albania"
+msgstr "Albania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: my-evolution/Locations.h:54
+msgid "Algeria"
+msgstr "Algerie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "American Samoa"
+msgstr "Amerikansk samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+msgid "Andorra"
+msgstr "Andorra"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "Angola"
+msgstr "Angola"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "Antarctica"
+msgstr "Antarktis"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Antigua And Barbuda"
+msgstr "Antigua og Barbuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: my-evolution/Locations.h:120
+msgid "Argentina"
+msgstr "Argentina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Armenia"
+msgstr "Armenia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Aruba"
+msgstr "Aruba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: my-evolution/Locations.h:154
+msgid "Australia"
+msgstr "Australia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
+msgid "Austria"
+msgstr "Austerrike"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Azerbaijan"
+msgstr "Aserbadjan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: my-evolution/Locations.h:161
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: my-evolution/Locations.h:164
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Barbados"
+msgstr "Barbados"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Belarus"
+msgstr "Kviterussland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: my-evolution/Locations.h:216
+msgid "Belgium"
+msgstr "Belgia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
+msgid "Belize"
+msgstr "Belize"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Benin"
+msgstr "Benin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: my-evolution/Locations.h:270
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Bosnia And Herzegowina"
+msgstr "Bosnia og Herzegovina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Botswana"
+msgstr "Botswana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bouvet Island"
+msgstr "Bouvet Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
+msgid "Brazil"
+msgstr "Brasil"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "British Indian Ocean Territory"
+msgstr "Britisk Indisk sjøterritorium"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: my-evolution/Locations.h:320
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "Burundi"
+msgstr "Burundi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Cambodia"
+msgstr "Kambodsja"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: my-evolution/Locations.h:354
+msgid "Canada"
+msgstr "Canada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Cape Verde"
+msgstr "Cape Verde"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: my-evolution/Locations.h:389
+msgid "Cayman Islands"
+msgstr "Cayman Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Central African Republic"
+msgstr "Den Sentralafrikanske republikken"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Chad"
+msgstr "Tjad"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
+msgid "Chile"
+msgstr "Chile"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "China"
+msgstr "Kina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: my-evolution/Locations.h:451
+msgid "Christmas Island"
+msgstr "Christmas Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Cocos (Keeling) Islands"
+msgstr "Cocos (Keeling) Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:483
+msgid "Colombia"
+msgstr "Colombia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "Comoros"
+msgstr "Comoros"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Congo"
+msgstr "Kongo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Cook Islands"
+msgstr "Cook Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: my-evolution/Locations.h:517
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: my-evolution/Locations.h:528
+msgid "Croatia"
+msgstr "Krotia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: my-evolution/Locations.h:532
+msgid "Cuba"
+msgstr "Kuba"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:545
+msgid "Cyprus"
+msgstr "Kypros"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: my-evolution/Locations.h:546
+msgid "Czech Republic"
+msgstr "Tjekkisk republikk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:580
+msgid "Denmark"
+msgstr "Danmark"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Dominica"
+msgstr "Dominica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: my-evolution/Locations.h:608
+msgid "Dominican Republic"
+msgstr "Dominikanske republikk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "East Timor"
+msgstr "Aust-timor"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:641
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: my-evolution/Locations.h:650
+msgid "Egypt"
+msgstr "Egypt"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:666
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Equatorial Guinea"
+msgstr "Ekvatorial Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: my-evolution/Locations.h:684
+msgid "Estonia"
+msgstr "Estland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Falkland Islands"
+msgstr "Falklandsøyane"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Faroe Islands"
+msgstr "Færøyane"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Fiji"
+msgstr "Fiji"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
+msgid "Finland"
+msgstr "Finland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
+msgid "France"
+msgstr "Frankrike"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "French Guiana"
+msgstr "French Guiana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "French Polynesia"
+msgstr "French Polynesia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "French Southern Territories"
+msgstr "Fransk sørleg territoriar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "Gabon"
+msgstr "Gabon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "Gambia"
+msgstr "Gambia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: my-evolution/Locations.h:811
+msgid "Georgia"
+msgstr "Georgia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: my-evolution/Locations.h:812
+msgid "Germany"
+msgstr "Tyskland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "Ghana"
+msgstr "Ghana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
+msgid "Greece"
+msgstr "Hellas"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "Greenland"
+msgstr "Grønland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Grenada"
+msgstr "Grenada"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Guam"
+msgstr "Guam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guinea"
+msgstr "Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guinea-bissau"
+msgstr "Guinea-bissau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Guyana"
+msgstr "Guyana"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
+msgid "Haiti"
+msgstr "Haiti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Heard And McDonald Islands"
+msgstr "Heard And McDonald Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Holy See"
+msgstr "Den heilage sjø"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: my-evolution/Locations.h:945
+msgid "Honduras"
+msgstr "Honduras"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: my-evolution/Locations.h:946
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: my-evolution/Locations.h:978
+msgid "Iceland"
+msgstr "Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:991
+msgid "India"
+msgstr "India"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
+msgid "Ireland"
+msgstr "Irland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Israel"
+msgstr "Israel"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1016
+msgid "Italy"
+msgstr "Italia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: my-evolution/Locations.h:1031
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1035
+msgid "Japan"
+msgstr "Japansk"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
+msgid "Jordan"
+msgstr "Jordan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Kazakhstan"
+msgstr "Kasakstan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "Kenya"
+msgstr "Kenya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Korea, Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Laos"
+msgstr "Laos"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: my-evolution/Locations.h:1190
+msgid "Latvia"
+msgstr "Latvia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1198
+msgid "Lebanon"
+msgstr "Libanon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1218
+msgid "Liberia"
+msgstr "Liberia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1234
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1268
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Macau"
+msgstr "Macau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Malawi"
+msgstr "Malawi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Maldives"
+msgstr "Maldivane"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Mali"
+msgstr "Mali"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1297
+msgid "Malta"
+msgstr "Malta"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Marshall Islands"
+msgstr "Marshall Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Martinique"
+msgstr "Martinique"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1387
+msgid "Mexico"
+msgstr "Mexico"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Micronesia"
+msgstr "Mikronesia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#, fuzzy
+msgid "Moldova, Republic Of"
+msgstr "Korea, Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Monaco"
+msgstr "Monaco"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1470
+msgid "Morocco"
+msgstr "Marokko"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mozambique"
+msgstr "Mozambique"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Namibia"
+msgstr "Namibia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Nauru"
+msgstr "Nauru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Nepal"
+msgstr "Nepal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1531
+msgid "Netherlands"
+msgstr "Nederland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Netherlands Antilles"
+msgstr "Nederlandske antillar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "New Caledonia"
+msgstr "New Caledonia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1560
+msgid "New Zealand"
+msgstr "Ny Zealand"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1562
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Niger"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Niue"
+msgstr "Niue"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1574
+msgid "Norfolk Island"
+msgstr "Norfolk Island"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Northern Mariana Islands"
+msgstr "Northern Mariana Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1587
+msgid "Norway"
+msgstr "Noreg"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1632
+msgid "Oman"
+msgstr "Oman"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1673
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "Palau"
+msgstr "Palau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Palestinian Territory"
+msgstr "Palestina"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1683
+msgid "Panama"
+msgstr "Panama"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Papua New Guinea"
+msgstr "Papua New Guinea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1688
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1723
+msgid "Peru"
+msgstr "Peru"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Philippines"
+msgstr "Fillipinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1764
+msgid "Poland"
+msgstr "Polen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1791
+msgid "Portugal"
+msgstr "Portugal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1824
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1836
+msgid "Qatar"
+msgstr "Qatar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Reunion"
+msgstr "Reunion"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1912
+msgid "Romania"
+msgstr "Romania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Russian Federation"
+msgstr "Russland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Saint Kitts And Nevis"
+msgstr "Saint Kitts And Nevis"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Saint Vincent And The Grena-dines"
+msgstr "Saint Vincent And The Grena-dines"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Samoa"
+msgstr "Samoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "San Marino"
+msgstr "San Marino"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Sao Tome And Principe"
+msgstr "Sao Tome And Principe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2035
+msgid "Saudi Arabia"
+msgstr "Saudi Arabia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Senegal"
+msgstr "Senegal"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Seychelles"
+msgstr "Seychellene"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2090
+msgid "Singapore"
+msgstr "Singapore"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2103
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2104
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Solomon Islands"
+msgstr "Solomon Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "Somalia"
+msgstr "Somalia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2119
+msgid "South Africa"
+msgstr "Sør-Afrika"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "South Georgia And The South Sandwich Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2127
+msgid "Spain"
+msgstr "Spania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "St. Helena"
+msgstr "St. Helena"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre And Miquelon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Sudan"
+msgstr "Sudan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2176
+msgid "Suriname"
+msgstr "Suriname"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbard og Jan Mayen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2181
+msgid "Sweden"
+msgstr "Sverige"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2183
+msgid "Switzerland"
+msgstr "Sveits"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2205
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#, fuzzy
+msgid "Tanzania, United Republic Of"
+msgstr "Tanzania"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "Thailand"
+msgstr "Thailand"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "Togo"
+msgstr "Togo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Tonga"
+msgstr "Tonga"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Trinidad And Tobago"
+msgstr "Trinidad og Tobago"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Tunisia"
+msgstr "Tunisia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2321
+msgid "Turkey"
+msgstr "Tyrkia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Turks And Caicos Islands"
+msgstr "Turks And Caicos Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Uganda"
+msgstr "Uganda"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2334
+msgid "Ukraine"
+msgstr "Ukrainia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "United Arab Emirates"
+msgstr "Forente Arabiske Emirater"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2342
+msgid "United Kingdom"
+msgstr "Storbritannia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "United States Minor Outlying Islands"
+msgstr "United States Minor Outlying Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2348
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2380
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2392
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "U.S. Virgin Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "U.S. Virgin Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Wallis And Futuna Islands"
+msgstr "Wallis And Futuna Islands"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Western Sahara"
+msgstr "Western Sahara"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2512
+msgid "Yemen"
+msgstr "Yemen"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2524
+msgid "Yugoslavia"
+msgstr "Jugoslavia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "Zambia"
+msgstr "Zambia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
+#: addressbook/gui/contact-editor/e-contact-editor.c:823
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:830
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1044
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VKort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2309
+#: addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -1321,7 +2547,7 @@ msgid "Edit Full"
 msgstr "Rediger full"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:961
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -1526,7 +2752,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -1535,173 +2761,118 @@ msgstr "Avansert søk"
 msgid "Search"
 msgstr "Søk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-#: addressbook/gui/widgets/e-addressbook-view.c:1516
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Lagre som VKort"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Opne"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Vidaresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "Send melding til kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: 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:67
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Skriv ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "Skriv ut konvolutt"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:842
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopier"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "Lim inn"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:296 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:18
-msgid "Delete"
-msgstr "Slett"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr "Vellukka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:363
+#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #, fuzzy
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Fann ikkje kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
+#: camel/camel-service.c:653 camel/camel-service.c:721
+#: camel/camel-service.c:764
 msgid "Cancelled"
 msgstr "Avbroten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringar?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -1709,81 +2880,203 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#. 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:404
-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 ",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,æ,ø,å"
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
 
-#. Translators: put here a list of characters that correspond to buttons
-#. 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:409
-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 ",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,æ,ø,å"
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Ingen kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Trykk her for å legge til ein kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Tilbakering telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Lagre som VKort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Ny kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Gå til mappe"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importér ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Slett kolonne"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Kjelde:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Pilot-innstillingar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Vidaresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Send melding til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "Skriv ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Print Envelope"
+msgstr "Skriv ut konvolutt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Kopier til mappe ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Flytt til _mappe ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopier"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Lim inn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
+#: 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:20
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Aktiv visning"
+
+#. Minicard view stuff
+#. 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:940
+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 ",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,æ,ø,å"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. 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:945
+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 ",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,æ,ø,å"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -1797,15 +3090,22 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "Lagre i addressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Kort-visning"
@@ -1893,6 +3193,7 @@ msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Liggjande"
 
@@ -1917,6 +3218,7 @@ msgid "Options"
 msgstr "Val"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Retning"
 
@@ -1937,7 +3239,9 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkjelde:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Ståande"
 
@@ -1997,34 +3301,30 @@ msgstr "_Skrifttype ..."
 msgid "Untitled appointment"
 msgstr "Avtale utan namn"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
 msgid "High"
 msgstr "Høg"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Vanleg"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
 msgid "Undefined"
 msgstr "Udefinert"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:770
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved kommunikasjon mot kalendartenaren"
 
@@ -2034,8 +3334,13 @@ msgstr "Feil ved kommunikasjon mot kalendartenaren"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "_Prioritet:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2049,48 +3354,62 @@ msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Innstillingar for kalendar og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Øydelagd oppsettfil."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
 msgid "Evolution calendar executive summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 #, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionkomponent for handtere kalendaren."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the Calendar Summary component."
 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 Evolution Tasks 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 for the calendar iTip view control"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Øydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Øydelagd oppsettfil."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr ""
@@ -2099,22 +3418,10 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Startar:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Slutt:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Evolution alarm"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -2152,7 +3459,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2235
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Åtvaring"
@@ -2173,7 +3480,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -2194,68 +3501,66 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1081
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
 #, 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:449 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
-#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:458
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:474
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-commands.c:820
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Offentleg"
 
@@ -2276,32 +3581,27 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr "Oppteke"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Ikkje starta"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Ferdig"
 
@@ -2314,9 +3614,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1494
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:55
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
+#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
+#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
+#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -2331,23 +3632,15 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:810
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:811
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Nei"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "Søker"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dagsvisning"
@@ -2364,48 +3657,84 @@ msgstr "Vekesvisning"
 msgid "Month View"
 msgstr "Månadsvising"
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Mappe inneheld avtaler og hendingar"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgåver"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Mappe inneheld huskeliste"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Lag ein ny avtale"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "New meeting"
+msgstr "Nettverksinnstillingar"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:695
+#, fuzzy
+msgid "_Meeting"
+msgstr "Møte"
+
+#: calendar/gui/component-factory.c:699
+#, fuzzy
+msgid "New task"
+msgstr "Ny oppgåve"
+
+#: calendar/gui/component-factory.c:699
+msgid "_Task"
+msgstr "_Oppgåve"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Opprett ei ny oppgåve"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Ny oppgåve"
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Avtale"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr ""
+"Kan ikkje fjerna post frå\n"
+"postboksen '%1':\n"
+"%2"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Endra namnet på denne mappa"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Val for lydlarm"
@@ -2471,9 +3800,7 @@ msgstr "Oppdater kvart"
 msgid "hours"
 msgstr "timar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutt"
 
@@ -2601,7 +3928,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.c:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -2630,7 +3957,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -2672,174 +3999,169 @@ msgid "Color for tasks due today"
 msgstr "Farge eller pixmap"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "Create new appointments with a default _reminder"
-msgstr "&Slett avtale"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Dagar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Første ve_kedag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
-msgid "O_verdue tasks:"
-msgstr "&Syntaksmerkingsmodusar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Show appointment _end times in week and month views"
-msgstr "Avtale"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigatøren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "Sta_rt på dagen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Su_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "_Oppgåver som skal vere ferdig i dag:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "T_ys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "_Oppgåver som skal vere ferdig i dag:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "_Oppgåveliste"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Tid_ssone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Oppdeling a_v tid:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timers (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "S_lutt på dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_Generelt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Neste melding"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Anna"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "&Syntaksmerkingsmodusar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Lau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "_Oppgåveliste"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Avtale"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Oppdeling a_v tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "before the start of the appointment"
 msgstr "&Slett avtale"
@@ -2912,74 +4234,61 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update object!"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2015
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Skriv over fil?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2022
-#: mail/mail-display.c:106
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ei fil med det namnet finst alt.\n"
-"Vil du skrive over den?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til å få tak i noverande versjon!"
 
@@ -3040,7 +4349,7 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -3054,14 +4363,14 @@ msgstr "Repetering"
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:365
 #, fuzzy
 msgid "Scheduling"
 msgstr "Køyreplan ..."
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr "Møte"
 
@@ -3108,7 +4417,7 @@ msgid "Pu_blic"
 msgstr "_Offentleg"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -3153,55 +4462,49 @@ msgstr "Deltakar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klikke her for å leggje til ein deltakar"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Felles namn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegert frå"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegert til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Språk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:809
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Rolle"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
+#: mail/message-list.etspec.h:11
 msgid "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:94
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -3216,7 +4519,7 @@ msgid "_Change Organizer"
 msgstr "_Endre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr "_Inviter andre ..."
 
@@ -3225,29 +4528,100 @@ msgstr "_Inviter andre ..."
 msgid "_Other Organizer"
 msgstr "Planleggjar"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "1."
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2."
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3."
+
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+#, fuzzy
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Anna"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Nord"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "liste"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Alternativ faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 #, fuzzy
 msgid "on the"
 msgstr "Månad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-#, fuzzy
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3348,7 +4722,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -3360,15 +4734,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Enkel"
+
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -3380,116 +4758,80 @@ msgstr "Sta_rt-dato:"
 msgid "_Due Date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Opne"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Lagre som ..."
+
+#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "S_kriv ut"
+
+#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
-#: calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Tildel oppgåve"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Fort framover"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "Slett _denne oppgåva"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk oppgåver som ferdig"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3928
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
 
@@ -3497,48 +4839,47 @@ msgstr "Trykk her for å leggje til ei oppgåve"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Fullføringsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Forfallsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 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:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -3572,404 +4913,180 @@ msgstr "%02i minutt oppdeling"
 
 #. 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:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Ny _avtale"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Gå _til idag"
-
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-msgid "_Go to Date..."
-msgstr "_Gå til dato ..."
-
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "Slett _denne avtalen"
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "Se&nd avtale"
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "Erstatt denne førekomsten?"
-
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Delete _All Occurrences"
-msgstr "Slettar klassen"
+msgid "New Meeting"
+msgstr "Møte"
 
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr "Møtet byrjar: <b>"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Ny oppgåve"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr "Oppgåva byrjar: <b>"
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Skriv ut ..."
 
-#: calendar/gui/e-itip-control.c:545
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Informasjon"
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to _Today"
+msgstr "Gå _til idag"
 
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr "Byrjar: <b>"
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
+msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
-msgid "Meeting ends: <b>"
+msgid "_Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Informasjon"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr "Sluttar: <b>"
+msgid "_Configure..."
+msgstr "Set opp %1"
 
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Task Completed: <b>"
-msgstr "Ferdig"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr "Oppgåva ferdig: <b>"
+msgid "_Configure Pilot..."
+msgstr "Set opp %1"
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "Informasjon"
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "_Lagre som ..."
 
-#. Title
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "iCalendar Error"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-msgid "An unknown person"
-msgstr "Ein ukjent person"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
-"under."
-
-#: calendar/gui/e-itip-control.c:748
-msgid "<i>None</i>"
-msgstr "<i>Ingen</i>"
-
-#: calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
-#: calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
-#: calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-msgid "Choose an action:"
-msgstr "Vel ei handling:"
-
-#: calendar/gui/e-itip-control.c:790
-msgid "Update"
-msgstr "Oppdater"
-
-#: calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-#: calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
-#: calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
-#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Godta"
+msgid "_Schedule Meeting..."
+msgstr "Køyreplan ..."
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Tentatively accept"
-msgstr "Mellombels"
-
-#: calendar/gui/e-itip-control.c:808
-msgid "Decline"
-msgstr "Avslå"
+msgid "_Forward as iCalendar..."
+msgstr "Fort framover"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 #, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Informasjon"
-
-#: calendar/gui/e-itip-control.c:835
-msgid "Update respondent status"
-msgstr "Opdatér status på svar"
+msgid "Make this Occurrence _Movable"
+msgstr "Se&nd avtale"
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "Informasjon"
-
-#: calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: calendar/gui/e-itip-control.c:909
-#, fuzzy, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "generer avlusingsinformasjon"
+msgid "Delete this _Occurrence"
+msgstr "Erstatt denne førekomsten?"
 
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 #, fuzzy
-msgid "Meeting Information"
-msgstr "Personleg informasjon"
-
-#: calendar/gui/e-itip-control.c:914
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> spør etter deg for å stille opp på eit møte."
-
-#: calendar/gui/e-itip-control.c:915
-msgid "Meeting Proposal"
-msgstr "Møteframlegg"
+msgid "Delete _All Occurrences"
+msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:919
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:920
-msgid "Meeting Update"
-msgstr "Møteoppdatering"
-
-#: calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, fuzzy, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "generer avlusingsinformasjon"
-
-#: calendar/gui/e-itip-control.c:925
-msgid "Meeting Update Request"
+msgid "Error executing %s."
 msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
 
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:1013
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:357 calendar/gui/e-meeting-model.c:782
-#: calendar/gui/e-meeting-model.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
+#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
+#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/e-itip-control.c:948
-#, 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:949
-msgid "Meeting Reply"
-msgstr "Møtesvar"
-
-#: calendar/gui/e-itip-control.c:953
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:954
-msgid "Meeting Cancellation"
-msgstr "Møtekansellering"
-
-#: calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
-#: calendar/gui/e-itip-control.c:1064
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:959
-#, fuzzy
-msgid "Bad Meeting Message"
-msgstr "&Finn i melding ..."
-
-#: calendar/gui/e-itip-control.c:979
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:980
-msgid "Task Information"
-msgstr "Oppgåveinformasjon"
-
-#: calendar/gui/e-itip-control.c:984
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:985
-msgid "Task Proposal"
-msgstr "Oppgåveframlegg"
-
-#: calendar/gui/e-itip-control.c:989
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b>%s</b> ønskjar å leggje til ei eksisterande oppgåve."
-
-#: calendar/gui/e-itip-control.c:990
-msgid "Task Update"
-msgstr "Oppgåveoppdatering"
-
-#: calendar/gui/e-itip-control.c:994
-#, 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:995
-msgid "Task Update Request"
-msgstr "Oppgåveoppdateringsforepørjing"
-
-#: calendar/gui/e-itip-control.c:1019
-#, 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:1020
-msgid "Task Reply"
-msgstr "Oppgåvesvar"
-
-#: calendar/gui/e-itip-control.c:1024
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> har kansellert ei oppgåve."
-
-#: calendar/gui/e-itip-control.c:1025
-msgid "Task Cancellation"
-msgstr "Oppgåvekansellering"
-
-#: calendar/gui/e-itip-control.c:1030
+#: calendar/gui/e-itip-control.c:1566
 #, fuzzy
-msgid "Bad Task Message"
-msgstr "Skriv ut alle"
-
-#: calendar/gui/e-itip-control.c:1049
-#, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "Skriv avlusingsinformasjon"
-
-#: calendar/gui/e-itip-control.c:1050
-msgid "Free/Busy Information"
-msgstr "Fri/ledig-informasjon"
-
-#: calendar/gui/e-itip-control.c:1054
-#, 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:1055
-msgid "Free/Busy Request"
-msgstr "Fri/ledig forespørsel"
-
-#: calendar/gui/e-itip-control.c:1059
-#, 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:1060
-msgid "Free/Busy Reply"
-msgstr "Fri/Oppteke svar"
-
-#: calendar/gui/e-itip-control.c:1065
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Private meldingar"
-
-#: calendar/gui/e-itip-control.c:1138
-msgid "The message does not appear to be properly formed"
-msgstr "Meldinga ser ikkje ut til å vere skikkeleg forma"
-
-#: calendar/gui/e-itip-control.c:1157
-#, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "Meldinga har ingen sendar"
-
-#: calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-msgid "The attachment does not contain a valid calendar message"
-msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
+msgid "Update complete\n"
+msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1216
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1317
-#, fuzzy
-msgid "Update complete\n"
-msgstr "Ferdig"
-
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1374
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1648
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Vel mappe"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Vel mappe"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4008,209 +5125,214 @@ msgstr "sluttdato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr "Ikkje-deltakarar"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:779
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:780
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:781
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:794
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:796
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 #, fuzzy
 msgid "Needs Action"
 msgstr "Vel ikon"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 msgid "In Process"
 msgstr "Under prossering"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2088
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 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 "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Val"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr "Vis kun _arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "Forminsk"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 #, fuzzy
 msgid "_Update Free/Busy"
 msgstr "Oppdateringsfrekvens"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 #, fuzzy
 msgid "_All People and Resources"
 msgstr "Alle filer og katalogar"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "&Helsingstekst:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr "Møt_e slutttid:"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:379
+#: calendar/gui/e-tasks.c:404
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Fullføringsdato"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Slettar valde objekt"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "Slett _denne avtalen"
+
+#: calendar/gui/gnome-cal.c:1538
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -4218,12 +5340,12 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1549
 #, 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:1859
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
@@ -4284,53 +5406,19 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#, fuzzy
-msgid "Event information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-msgid "Task information"
-msgstr "Informasjon om oppgåve"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#, fuzzy
-msgid "Journal information"
-msgstr "Personleg informasjon"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#, fuzzy
-msgid "Free/Busy information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:321
-#, fuzzy
-msgid "Calendar information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:370
-#, fuzzy, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:382
-#, fuzzy
-msgid "iCalendar information"
-msgstr "Informasjon"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr ""
@@ -4338,239 +5426,207 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Sun"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %d. %b"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Vald månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Oppgåve"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioritet: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Prosent ferdig: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Kategoriar %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Kontaktar: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Skriv ut kalendar"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2512 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
@@ -4579,12 +5635,12 @@ msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -4592,10 +5648,16 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2249
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Skriv ut kort"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -4638,103 +5700,127 @@ msgstr "Fabrikk for å importere VCard-filer inn i Evolution."
 msgid "Imports iCalendar files into Evolution"
 msgstr "Importerar VCard-filer inn i Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importerar VCard-filer inn i Evolution."
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Kalendermelding"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution har funne Pine e-postfiler.\n"
+"Vil du importere desse inn i Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Kalender"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr ""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 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:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -6291,12 +7377,12 @@ msgstr "Knapp (ikkje støtta av KControl)"
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-data-cache.c:159
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-data-cache.c:426
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -6332,58 +7418,57 @@ msgstr "Registrerer hjå tenaren ..."
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar frå %1"
@@ -6400,7 +7485,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -6409,7 +7494,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -6418,39 +7503,35 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
@@ -6571,167 +7652,119 @@ msgstr "Oppgi ditt OpenPGP-passord"
 msgid "Please enter your %s passphrase"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
 #, 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:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: camel/camel-pgp-context.c:993
 #, 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:970
+#: camel/camel-pgp-context.c:1004
 #, 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:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: camel/camel-pgp-context.c:1194
 #, 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:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, fuzzy, c-format
-msgid "Please enter your password for %s"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Feil ved tilleggjing av kort"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "Ugyldig argument"
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kunne ikkje lasta biletet '%1'\n"
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kunne ikkje lasta biletet '%1'\n"
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Klarte ikkje å lagre signaturfil."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Klarte ikkje å laste %s: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s tenar %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Tilknytning avbroten"
 
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:274
+#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ukjend vert)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
+#: camel/camel-remote-store.c:473
 #: camel/providers/imap/camel-imap-command.c:228
 #: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -6830,13 +7863,14 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "NT Login"
+#, fuzzy
+msgid "Login"
+msgstr "Logan"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -6847,9 +7881,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Inga autentisering i det heile"
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
+#: camel/providers/nntp/camel-nntp-store.c:153
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Passord"
 
@@ -6894,26 +7938,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår opp: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i namneoppslag: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Slår opp: %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -6922,12 +7979,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6936,6 +7993,11 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Oppgi ditt OpenPGP-passord"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
@@ -6969,23 +8031,23 @@ msgstr "Klarte ikkje å dekode melding."
 msgid "Failed to verify certificates."
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7002,7 +8064,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7011,16 +8073,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7045,27 +8107,27 @@ msgstr "Klarter ikkje å tolke URL frå «%s»"
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "Inga slik melding: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
@@ -7099,59 +8161,59 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, 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:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2104
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2141
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, 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: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
+#: camel/providers/imap/camel-imap-message-cache.c:257
+#: camel/providers/imap/camel-imap-message-cache.c:314
+#: camel/providers/imap/camel-imap-message-cache.c:345
+#: camel/providers/imap/camel-imap-message-cache.c:377
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Kunne ikkje leggja til melding:\n"
@@ -7166,7 +8228,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:832
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Mapper"
 
@@ -7200,28 +8262,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tenaren %s søttar ikkje den ønska autentiseringstypa %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:390
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7231,87 +8293,101 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:48
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:64
 #, fuzzy
 msgid "Local delivery"
 msgstr "Mapper"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/local/camel-local-provider.c:68
+#: camel/providers/local/camel-local-provider.c:82
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standardfil"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-provider.c:116
+msgid "Directory tree of mbox files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:117
+msgid ""
+"For accessing mail storedin an external tree of mbox files.\n"
+"This will allow you to directly access pine and elm folders.\n"
+"NOTE: This provider is still experimental so ensure you backup any mail "
+"folders first."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, fuzzy, c-format
 msgid "Local mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -7319,7 +8395,12 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-local-store.c:379
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
@@ -7327,18 +8408,18 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, fuzzy, c-format
 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:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -7359,7 +8440,7 @@ msgstr "Mottek meldingar frå %1"
 #: 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
+#: camel/providers/local/camel-spool-folder.c:582
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7369,7 +8450,7 @@ msgstr "Kan ikkje setja blokkstorleik for band."
 #: 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
+#: camel/providers/local/camel-spool-folder.c:582
 #, fuzzy
 msgid "No such message"
 msgstr "Vidaresendt melding"
@@ -7379,7 +8460,7 @@ msgstr "Vidaresendt melding"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, fuzzy, c-format
 msgid ""
@@ -7390,14 +8471,14 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappa «%s» eksisterar ikkje."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, fuzzy, c-format
 msgid ""
@@ -7405,29 +8486,30 @@ msgid ""
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: 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:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
@@ -7435,14 +8517,36 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Berre sjekk for ny e-post."
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Melding"
+
+#. 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-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:250
+#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:381
+#: camel/providers/local/camel-spool-summary.c:646
+#: camel/providers/local/camel-spool-summary.c:945
+msgid "Storing folder"
+msgstr "Lagrar mappe"
+
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-spool-folder.c:277
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
 #: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-spool-folder.c:459
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -7463,9 +8567,9 @@ msgstr ""
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mbox-folder.c:379
 #: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-spool-folder.c:598
+#: camel/providers/local/camel-spool-folder.c:630
+#: camel/providers/local/camel-spool-folder.c:642
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -7473,16 +8577,16 @@ msgid ""
 msgstr "Mottek meldingar frå %1"
 
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-spool-folder.c:631
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:643
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -7492,45 +8596,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, 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:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "«%s» er ikkje ei vanleg fil."
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, 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:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, 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: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
-msgid "Storing folder"
-msgstr "Lagrar mappe"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -7538,21 +8631,21 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -7560,8 +8653,8 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -7569,49 +8662,49 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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
+#: 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:700
+#: camel/providers/local/camel-spool-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:988
+#: camel/providers/local/camel-spool-summary.c:996
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:752
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-spool-summary.c:774
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-spool-summary.c:1046
 #, 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:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
@@ -7631,12 +8724,12 @@ msgstr "Mottek meldingar frå %1"
 msgid "`%s' is not a directory."
 msgstr "«%s» er ikkje ein katalog"
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikkje opna katalogen %1"
 
-#: camel/providers/local/camel-spool-folder.c:512
+#: camel/providers/local/camel-spool-folder.c:515
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Mottek meldingar frå %1"
@@ -7647,6 +8740,7 @@ 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:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Fila finst ikkje\n"
@@ -7658,19 +8752,21 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
@@ -7678,73 +8774,38 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, 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:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, 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:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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:64
-msgid "Server rejected username"
-msgstr "Tenaren avslo brukarnamnet"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/local/camel-spoold-store.c:117
 #, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan ikkje setja blokkstorleik for band."
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#, fuzzy
-msgid "User cancelled"
-msgstr "Operasjonen vart avbroten"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Kunne ikkje starta underprosess."
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "%1 finst, men er inga vanleg fil"
 
-#: 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"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
+#: camel/providers/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "Melding til %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -7754,12 +8815,12 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -7801,143 +8862,153 @@ msgstr "Avbryt"
 msgid "Operation failed: %s"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar frå %1"
 
-#: 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:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+#, fuzzy
+msgid "User cancelled"
+msgstr "Operasjonen vart avbroten"
 
-#: 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:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Sentrer dei valte elementa"
 
-#: 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: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:367
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slå saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan ikkje setja blokkstorleik for band."
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Kjende program"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Message storage"
 msgstr "Meldingsliste"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
 msgstr "&La e-posten liggja på tenaren."
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, fuzzy, c-format
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:71
 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:79
+#: camel/providers/pop3/camel-pop3-provider.c:81
 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: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:198
-#, fuzzy, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Kunne ikkje starta underprosess."
-
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, fuzzy, c-format
-msgid "Could not connect to server: %s"
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:321
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operasjonen vart stoppa"
+
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentisering feila."
+
+#: camel/providers/pop3/camel-pop3-store.c:348
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s."
+msgid "Could not connect to POP server on %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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:377
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
-"Error sending username: %s"
+"No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Ukjend)"
+#: camel/providers/pop3/camel-pop3-store.c:405
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+#: camel/providers/pop3/camel-pop3-store.c:416
+msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:431
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/U-feil"
+
+#: camel/providers/pop3/camel-pop3-store.c:452
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "Oppgi ditt OpenPGP-passord"
+
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Uventa svar frå POP-tenaren: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7947,55 +9018,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Klarter ikkje å tolke URL frå «%s»"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, 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:137
 #, 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:165
 #, 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:178
 #, 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:185
 #, 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:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-#, fuzzy
-msgid "Could not find 'From' address in message"
-msgstr "Vidaresendt melding frå %1"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "Klarter ikkje å tolke URL frå «%s»"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8003,126 +9069,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Teneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:318
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Meldinga ser ikkje ut til å vere skikkeleg forma"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Feil svar på RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8130,137 +9217,135 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: camel/providers/smtp/camel-smtp-transport.c:838
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Møte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:716
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:754
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:769
-#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:790
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:864
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1081
+#, fuzzy
+msgid "MAIL FROM response error"
+msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:908
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:927
-#, 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:1121
+#, c-format
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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:980
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr ""
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1171
+#, fuzzy
+msgid "DATA response error"
+msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1100
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1280
+#, fuzzy
+msgid "RSET response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1142
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1317
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Feil svar på RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -8287,7 +9372,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -8331,11 +9416,11 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -8343,57 +9428,57 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:395
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -8402,57 +9487,53 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:905
-msgid "Save as..."
-msgstr "Lagre som ..."
-
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Åtvaring:"
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:993
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1058
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1065
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -8461,13 +9542,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1176
 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:1281
+#: composer/e-msg-composer.c:1334
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -8477,42 +9558,42 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1311
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1460
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1846 composer/e-msg-composer.c:2322
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2362 composer/e-msg-composer.c:2417
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Klarar ikkje å starte Evolution-komponisten."
 
@@ -8564,15 +9645,33 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ei fil med det namnet finst alt.\n"
+"Vil du skrive over den?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Kategoriar"
+
 #. 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:362
@@ -8659,171 +9758,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolutionkomponent for Mitt samandrag"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Vel ei fil"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Send ein e-post"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Endra namnet på denne mappa"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Lukk"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Flytt denne mappa til ein annan plass"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Set opp %1"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Side"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Feil ved asting av %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:61
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "Øydelagd oppsettfil."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Samandrag"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Øydelagd oppsettfil."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Øydelagd oppsettfil."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Estherville"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Feil"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Oppdater"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Oppdateringsfrekvens"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "år"
@@ -8856,11 +9790,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekund"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "sekund"
 
@@ -8930,7 +9860,7 @@ msgstr " sidan"
 msgid "ago"
 msgstr "sidan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %k:%M"
@@ -8945,34 +9875,26 @@ msgid "Filter Rules"
 msgstr "Filter-reglar"
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 #, fuzzy
 msgid "Then"
 msgstr "Tiaren"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 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:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:834
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<klikk her for å velje mappe>"
-
 #: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
@@ -8982,7 +9904,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Test"
 
@@ -8990,40 +9912,40 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Du gi dette filteret eit namn."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Dersom"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 #, fuzzy
 msgid "Execute actions"
 msgstr "Køyr autorun.sh"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "inkomande"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "Utgåande"
 
@@ -9070,194 +9992,217 @@ msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tildel farge"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
+
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "inneheld"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Sletta"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr "høyres ikkje ut som"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Eksisterar ikkje"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "sluttar med"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterar"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "eksisterar"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "var før"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Flagga"
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "er større enn"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "er ikkje"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Flagga"
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
+#: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "Needs Reply"
-msgstr "Fri/Oppteke svar"
+msgid "Play Sound"
+msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr "Mottakarar"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1486
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr "Avsendar"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Storleik (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr "høyres ut som"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "byrjar med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Emne"
 
@@ -9265,11 +10210,11 @@ msgstr "Emne"
 msgid "Rules"
 msgstr "Linjer"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -9290,30 +10235,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerar ..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Venlegast vent"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerar %s som %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sender %1"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:101
 msgid "Mail"
 msgstr "E-post"
 
@@ -9337,24 +10282,77 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioritet: %s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Papirkorg"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Leitar etter tilleggsmodular"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Startar importering"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Rediger filter"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9376,54 +10374,104 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Øydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Øydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Øydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Øydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolutionskomponent for å handtere e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 #, fuzzy
 msgid "Evolution mail composer."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 #, fuzzy
 msgid "Evolution mail executive summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
 msgid "Evolution mail folder display component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 #, fuzzy
 msgid "Evolution mail folder factory component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Evolution composer."
 msgstr "Øydelagd oppsettfil."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the Mail Summary component."
 msgstr "Øydelagd oppsettfil."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Repetering"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontoar"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 #, fuzzy
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:100
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
+
+#: mail/component-factory.c:101
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Fil alt i liste"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "E-post lagrinsmappe (intern)"
-
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell papirkorg"
@@ -9433,25 +10481,20 @@ msgstr "Virtuell papirkorg"
 msgid "Virtual Trash folder"
 msgstr "Mapper"
 
-#: 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:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikkje innehalde meldingar."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:403
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet på spelarane"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -9459,228 +10502,240 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til å vere øydelagde, sjekk at alt "
 "er i orden."
 
-#: mail/component-factory.c:952
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr "Du har ikkje sett opp ein transportmetode for e-post"
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/component-factory.c:952
-msgid "New _Mail Message"
-msgstr "Ny e-post_melding"
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr ""
 
-#: mail/component-factory.c:977
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Klarar ikkje initialisere Evolution sin e-postkomponent"
 
-#: mail/component-factory.c:986
+#: mail/component-factory.c:1003
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1009
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1208
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr " Koplar til tenar ..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje å registrer lager med skal"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for «%s»"
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:307
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d gøymde"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d valde"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "Lag vFolder frå søk"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Mapper"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1590
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "_Lagre som ..."
-
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1623
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Ferdig"
+
+#: mail/folder-browser.c:1624
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Tøm"
+
+#. separator here?
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1636
 #, fuzzy
-msgid "Mark as Needing Reply"
-msgstr "Møtesvar"
+msgid "U_ndelete"
+msgstr "Slett"
 
-#: mail/folder-browser.c:1472
+#: mail/folder-browser.c:1640
 #, fuzzy
-msgid "Mark as Not Needing Reply"
-msgstr "Møtesvar"
-
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
+msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:107
+#: mail/folder-browser.c:1645
 #, fuzzy
-msgid "_Undelete"
-msgstr "Slett"
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
-msgstr "Bruk filter"
-
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1653
 #, fuzzy
-msgid "Create Ru_le From Message"
-msgstr "Mapper"
+msgid "Appl_y Filters"
+msgstr "Bruk filter"
 
 #: mail/folder-browser.c:1657
 #, fuzzy
-msgid "Filter on Mailing List"
-msgstr "Fil alt i liste"
+msgid "Crea_te Rule From Message"
+msgstr "Mapper"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1936
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrér på e-postliste (%s)"
 
-#: mail/folder-browser.c:1661
+#: mail/folder-browser.c:1939
 #, fuzzy, c-format
-msgid "VFolder on Mailing List (%s)"
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Forvald"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Hentar informasjon om mapper"
@@ -9703,28 +10758,21 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importér Outlook Express 4 filer inn i Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Kroppsinnhald"
-
-#: mail/local-config.glade.h:2
 #, fuzzy
 msgid "Current store format:"
 msgstr "Kunne ikkje starta %1."
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indekserar"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Postkasseformat"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Kroppsinnhald"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 #, fuzzy
 msgid "New store format:"
 msgstr "&Ny type"
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -9734,15 +10782,15 @@ msgstr ""
 "(slik som slutt på diskplass) kan vere vanskeleg å rette opp.\n"
 "Bruk denne funksjonen med varsemd."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -9761,89 +10809,82 @@ msgstr "KDeelop-installering"
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "Klarte ikkje å lagre signaturfil."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "Lagre signatur"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Br_ukarnamn:"
+
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
+#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
+#: mail/mail-config.glade.h:94
 #, fuzzy
+msgid "Random"
+msgstr "Radio"
+
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Dette er siste trekk.\n"
-"Vil du leggja til fleire trekk?"
 
-#: mail/mail-account-gui.c:1663
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (standard)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Skru av"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Skru på"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:212
 #, 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:297
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "Ikkje slett"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "Verkeleg slette konto?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Skru av"
+
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Skru på"
+
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
 #, 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:823 mail/mail-config.glade.h:49
-msgid "Mail Settings"
-msgstr "Innstillingar for e-post"
-
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Melding til %s"
-
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Emne er %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "På"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Melding frå %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Konton_amn:"
 
-#: mail/mail-autofilter.c:289
-#, fuzzy, c-format
-msgid "%s mailing list"
-msgstr "E-post&liste for språket:"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -9855,7 +10896,7 @@ msgstr ""
 "eller skrive e-post.\n"
 "Vil du sette opp dette no?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -9863,7 +10904,7 @@ msgstr ""
 "Du må sette opp ein identitet\n"
 "før du skrive e-post."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -9871,12 +10912,8 @@ msgstr ""
 "Du må sette opp ein transport av e-post\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "Du har ikkje sett opp ein transportmetode for e-post"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -9884,18 +10921,18 @@ msgstr ""
 "Du sender ei HTML-formattert melding, men den følgjande mottakeren vil ikkje "
 "ha HTML-formatter e-post:\n"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:251
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -9903,11 +10940,11 @@ msgstr ""
 "Sidan kontaktlista du sender til, er sett opp til å gøyme addressatane, vil "
 "den sette opp alle mottakarane som Bcc."
 
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -9917,80 +10954,90 @@ msgstr ""
 "«Apparently-To»-topptekst.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:461
-#, fuzzy
-msgid "This message contains invalid recipients:"
-msgstr "Meldinga har ingen sendar"
-
-#: mail/mail-callbacks.c:496
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakarar for å sende denne meldinga."
 
-#: mail/mail-callbacks.c:584
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr "Du må setje opp ein konto før du kan sende denn e-posten."
 
-#: mail/mail-callbacks.c:703
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:913
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:918
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/mail-callbacks.c:1363 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1365 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1866
+#: mail/mail-callbacks.c:2091
 #, 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:1891
+#: mail/mail-callbacks.c:2116
 #, 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:1930
+#: mail/mail-callbacks.c:2155
 #, 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:1944
+#: mail/mail-callbacks.c:2169
 #, 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:1970
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2069
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Skriv over fil?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2071
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2242
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Vis informasjonsmelding"
+
+#: mail/mail-callbacks.c:2373
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9998,30 +11045,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2357
+#: mail/mail-callbacks.c:2728
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2783
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Mottek meldingar frå %1"
+
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2480
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2519
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Utskrift av melding feila"
 
-#: mail/mail-callbacks.c:2685
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, 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?"
@@ -10063,17 +11115,36 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.c:337
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: mail/mail-config.c:1954
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "etter"
+
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10081,109 +11152,158 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1965
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: innboks"
-
-#: mail/mail-config.c:2207
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:2285 mail/mail-config.c:2289
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
 
+#: mail/mail-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontakt utan namn"
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
+msgstr ""
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " _Check for supported types "
-msgstr "Vel modemtype ..."
+msgid " "
+msgstr ", "
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "farge"
+#, fuzzy
+msgid " Edit "
+msgstr "R_edigér"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid " New "
+msgstr "Ny"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "Vel modemtype ..."
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Konto"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Kontoar"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Avbryt operasjon"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: mail/mail-config.glade.h:15
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always blind carbon-copy to:"
+#: mail/mail-config.glade.h:17
+msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always carbon-copy to:"
+#: mail/mail-config.glade.h:18
+msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
+
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Kunne ikkje lagra melding(ar)."
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:15
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "enkle innlegg"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Ukjent teiknsett: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Lukk"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:17
-msgid "Composer"
-msgstr "Meldingsskrivar"
-
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "Forventar %1"
-
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10193,400 +11313,596 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+msgstr "Bari"
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:28
-msgid "Default Forward style is: "
-msgstr "Standard vidaresendingsstil er: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:40
 #, fuzzy
-msgid "Default character encoding: "
+msgid "Default character _encoding:"
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:41
 #, fuzzy
-msgid "Defaults"
-msgstr "Forvald"
+msgid "Deleting Mail"
+msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale IDar ..."
 
-#: mail/mail-config.glade.h:33
-msgid "Display"
-msgstr "Vis"
-
-#: mail/mail-config.glade.h:34
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Kladd"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "S_lå på"
 
-#: mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Rediger ..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:39
-msgid "Enabled"
-msgstr "På"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Aust"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "E-post inneheld"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "E-postadresse:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Tøm papirkorg ved avslutting"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "sluttar med"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Eigenskapar"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Vidaresendt melding"
+
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML signature file:"
-msgstr "HTML-signaturfil:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "Merkingsvilkår"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:45
-msgid "In HTML mail"
-msgstr "I HTML-e-post"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Lagre og lukk"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Last b_ileter"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:51
-msgid "Make this my _default account"
-msgstr "Gjer _dette til min standardkonto"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Meldingsvisning"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronesia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:54
-msgid "News"
-msgstr "Nyhende"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Diskusjonsgruppetenarar"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:58
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_sasjon:"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP-lykje ID:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:62
-msgid "Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 #, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:89
 #, fuzzy
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Sender meldingar til %1"
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Sender meldingar til %1"
+msgid "Printed Fonts"
+msgstr "&Innhald ..."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "Kan ikkje opne melding"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Svar-til:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:71
-msgid "Receiving Mail"
-msgstr "Mottak av e-post"
-
-#: mail/mail-config.glade.h:72
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Val for mottak"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Husk dette passordet"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:75
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Tryggleik"
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Same as text"
+msgstr "Somerset"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:76
-msgid "Security"
-msgstr "Tryggleik"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
 #, fuzzy
-msgid "Select Filter Log file..."
+msgid "Select PGP program"
+msgstr "Vel PGP-binær"
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:78
-msgid "Select PGP binary"
-msgstr "Vel PGP-binær"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Slett alt utanom signatur"
 
-#: mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:80
-msgid "Sending Mail"
-msgstr "Sender e-post"
-
-#: mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Sendt"
-
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:88
-msgid "Signature file:"
-msgstr "Signaturfil:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Snarvegar"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Lagre signatur"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Kjelde"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:91
-msgid "Sources"
-msgstr "Kjelder"
-
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Stilnamn:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:95
-msgid "Use s_ecure connection (SSL)"
-msgstr "Bruk sikker tilknytning (SSL)"
+#: mail/mail-config.glade.h:128
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Aust"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Autentiseringtype: "
+
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
+
+#: mail/mail-config.glade.h:148
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "Lagra i &kladdemappe"
+msgid "_Confirm when expunging a folder"
+msgstr "Forventar %1"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:149
 #, fuzzy
-msgid "_Email Address:"
-msgstr "E-post-adresse:"
+msgid "_Defaults"
+msgstr "Forvald"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
 #, fuzzy
-msgid "_Empty trash folders on exit"
-msgstr "Tøm papirkorg ved avslutting"
+msgid "_Filename:"
+msgstr "Filnamn:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Vidaresend som"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "I HTML-e-post"
+
+#: mail/mail-config.glade.h:160
 msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:162
 #, fuzzy
-msgid "_Highlight citations with"
-msgstr "Merkingsvilkår"
+msgid "_Identity"
+msgstr "Identitet"
 
-#: mail/mail-config.glade.h:113
-msgid "_Host:"
-msgstr "_Vert:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Språk"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:115
-msgid "_Log filter actions to:"
-msgstr "_Loggfør filterhandlingar til:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Gjer _dette til min standardkonto"
 
-#: mail/mail-config.glade.h:116
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "Last aldri bileter frå _nettet"
 
-#: mail/mail-config.glade.h:119
-msgid "_Organization:"
-msgstr "_Organisasjon:"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "_Path:"
-msgstr "_Sti:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:172
 #, fuzzy
-msgid "_Remember this password"
-msgstr "Fjern denne oppføringa"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:173
 #, fuzzy
-msgid "_Send mail in HTML format by default."
-msgstr "Send meldingar:"
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:124
-msgid "_Server Type: "
-msgstr "_Tenartype: "
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
 
-#: mail/mail-config.glade.h:125
-msgid "_Signature file:"
-msgstr "_Signaturfil:"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Mottak av e-post"
 
-#: mail/mail-config.glade.h:126
-msgid "_Username:"
-msgstr "Br_ukarnamn:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Tryggleik"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Tryggleik"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Sender e-post"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Vis tid som"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Bruk sikker tilknytning (SSL)"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variabel"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_kvar"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "farge"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:131
-#, fuzzy
-msgid "placeholder"
-msgstr "Bruk &plasshaldarar"
-
-#: mail/mail-config.glade.h:132
-msgid "seconds."
-msgstr "sekund."
-
 #: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
@@ -10632,185 +11948,178 @@ 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:252
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Lagra til disk ..."
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Vis innvevd"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %s ..."
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:428
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Gøym"
 
-#: mail/mail-display.c:449
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Ekstern visar"
 
-#: mail/mail-display.c:1171
+#: mail/mail-display.c:1265
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1666
+#: mail/mail-display.c:1832
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1668
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1671
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:1674
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Frå"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1768
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1791
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1799
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1807
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "E-post"
 
-#: mail/mail-format.c:2022
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2036
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2041
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2070
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, 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:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Klarar ikkje å lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 #, 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:1416
+#: mail/mail-local.c:1414
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
@@ -10837,127 +12146,122 @@ msgstr ""
 msgid "Working"
 msgstr "Arbeidar"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:498 mail/mail-ops.c:527
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:683
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:702
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:704 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:797
+#: mail/mail-ops.c:837
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:917
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1017
+#: mail/mail-ops.c:1057
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1067 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Papirkorg"
-
-#: mail/mail-ops.c:1200
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1243
+#: mail/mail-ops.c:1283
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1315
+#: mail/mail-ops.c:1355
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1384
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1478
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1529
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1605
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1614
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentat melding %s"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1919
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -10966,38 +12270,38 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1981
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:1997
+#: mail/mail-ops.c:2037
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2028
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2098
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
-#: mail/mail-ops.c:2197
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Søk"
 
@@ -11033,42 +12337,42 @@ msgstr "Finn:"
 msgid "Matches:"
 msgstr "Treff:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Avbroten."
 
@@ -11085,25 +12389,40 @@ msgstr "Tast inn passord for %s"
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Klarte ikkje å lagre signaturfil."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Lagre signatur"
+
+#: mail/mail-signature-editor.c:178
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"Dette er siste trekk.\n"
+"Vil du leggja til fleire trekk?"
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Postsamandrag"
+msgid "Signature name:"
+msgstr "Signaturfil:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
@@ -11126,10 +12445,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "vMapper"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "vMapper"
@@ -11147,87 +12462,145 @@ msgstr "Prøvar å redigere ei vmappe «%s» som ikkje finnest."
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Ikkje noko emne)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - melding"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:666
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Høgare"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Høgast"
 
-#: mail/message-list.c:937
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:944
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "I dag, %H:%M"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2387
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Ferdig"
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Status"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Flagga"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Storleik"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Gå framover"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Tenarinformasjon"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Vidaresend"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Svar"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Førehandsvisning"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11249,7 +12622,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar frå %1"
 
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
@@ -11294,6 +12667,35 @@ msgstr "_Abboner"
 msgid "_Unsubscribe"
 msgstr "_Fjern abbonnment"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Evolutionkomponent for Mitt samandrag"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Øydelagd oppsettfil."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Innstillingar for samandrag"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Århus"
@@ -11458,10 +12860,6 @@ msgstr "Alaska"
 msgid "Al Baha"
 msgstr "Al Baha"
 
-#: my-evolution/Locations.h:42
-msgid "Albania"
-msgstr "Albania"
-
 #: my-evolution/Locations.h:43
 msgid "Albany"
 msgstr "Albany"
@@ -11506,10 +12904,6 @@ msgstr "Alexandria/Nouzha"
 msgid "Alexandroupolis"
 msgstr "Alexandroupolis"
 
-#: my-evolution/Locations.h:54
-msgid "Algeria"
-msgstr "Algerie"
-
 #: my-evolution/Locations.h:55
 msgid "Alghero"
 msgstr "Alghero"
@@ -11770,10 +13164,6 @@ msgstr "Ardmore"
 msgid "Arequipa"
 msgstr "Arequipa"
 
-#: my-evolution/Locations.h:120
-msgid "Argentina"
-msgstr "Argentina"
-
 #: my-evolution/Locations.h:121
 msgid "Arica"
 msgstr "Arica"
@@ -11906,14 +13296,6 @@ msgstr "Austin"
 msgid "Australasia"
 msgstr "Australasia"
 
-#: my-evolution/Locations.h:154
-msgid "Australia"
-msgstr "Australia"
-
-#: my-evolution/Locations.h:155
-msgid "Austria"
-msgstr "Austerrike"
-
 #: my-evolution/Locations.h:156
 msgid "Avalon"
 msgstr "Avalon"
@@ -11934,10 +13316,6 @@ msgstr "Bage"
 msgid "Bagotville"
 msgstr "Bagotville"
 
-#: my-evolution/Locations.h:161
-msgid "Bahamas"
-msgstr "Bahamas"
-
 #: my-evolution/Locations.h:162
 msgid "Bahia Blanca"
 msgstr "Bahia Blanca"
@@ -11946,10 +13324,6 @@ msgstr "Bahia Blanca"
 msgid "Bahias de Huatulco"
 msgstr "Bahias de Huatulco"
 
-#: my-evolution/Locations.h:164
-msgid "Bahrain"
-msgstr "Bahrain"
-
 #: my-evolution/Locations.h:165
 msgid "Baker City"
 msgstr "Baker City"
@@ -12154,18 +13528,10 @@ msgstr "Belfast/Aldergrove"
 msgid "Belfast/Harbour"
 msgstr "Belfast/Harbour"
 
-#: my-evolution/Locations.h:216
-msgid "Belgium"
-msgstr "Belgia"
-
 #: my-evolution/Locations.h:217
 msgid "Belgorod"
 msgstr "Belgorod"
 
-#: my-evolution/Locations.h:218
-msgid "Belize"
-msgstr "Belize"
-
 #: my-evolution/Locations.h:219
 msgid "Belleville"
 msgstr "Belleville"
@@ -12370,10 +13736,6 @@ msgstr "Bogota/Eldorado"
 msgid "Boise"
 msgstr "Boise"
 
-#: my-evolution/Locations.h:270
-msgid "Bolivia"
-msgstr "Bolivia"
-
 #: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr "Bologna"
@@ -12466,10 +13828,6 @@ msgstr "Bratsk"
 msgid "Braunschweig"
 msgstr "Braunschweig"
 
-#: my-evolution/Locations.h:294
-msgid "Brazil"
-msgstr "Brasil"
-
 #: my-evolution/Locations.h:295
 msgid "Bremen"
 msgstr "Bremen"
@@ -12570,10 +13928,6 @@ msgstr "Budapest"
 msgid "Buffalo"
 msgstr "Buffalo"
 
-#: my-evolution/Locations.h:320
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
 #: my-evolution/Locations.h:321
 msgid "Bullfrog"
 msgstr "Bullfrog"
@@ -12706,10 +14060,6 @@ msgstr "Camp Stanley/H-207"
 msgid "Canaan"
 msgstr "Canaan"
 
-#: my-evolution/Locations.h:354
-msgid "Canada"
-msgstr "Canada"
-
 #: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
 msgstr "Canarias/Fuerteventura"
@@ -12846,10 +14196,6 @@ msgstr "Catacamas"
 msgid "Catania"
 msgstr "Catania"
 
-#: my-evolution/Locations.h:389
-msgid "Cayman Islands"
-msgstr "Cayman Islands"
-
 #: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
 msgstr "Cayo Largo del Sur"
@@ -13042,10 +14388,6 @@ msgstr "Chihuahua"
 msgid "Childress"
 msgstr "Childress"
 
-#: my-evolution/Locations.h:438
-msgid "Chile"
-msgstr "Chile"
-
 #: my-evolution/Locations.h:439
 msgid "China Lake"
 msgstr "China Lake"
@@ -13094,10 +14436,6 @@ msgstr "Chongju Ab"
 msgid "Christchurch"
 msgstr "Christchurch"
 
-#: my-evolution/Locations.h:451
-msgid "Christmas Island"
-msgstr "Christmas Island"
-
 #: my-evolution/Locations.h:452
 msgid "Chulitna"
 msgstr "Chulitna"
@@ -13222,10 +14560,6 @@ msgstr "College Station"
 msgid "Colmar-Meyenheim"
 msgstr "Colmar-Meyenheim"
 
-#: my-evolution/Locations.h:483
-msgid "Colombia"
-msgstr "Colombia"
-
 #: my-evolution/Locations.h:484
 msgid "Colonia"
 msgstr "Colonia"
@@ -13358,10 +14692,6 @@ msgstr "Cortez"
 msgid "Corumba"
 msgstr "Corumba"
 
-#: my-evolution/Locations.h:517
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
 #: my-evolution/Locations.h:518
 msgid "Cotulla"
 msgstr "Cotulla"
@@ -13402,10 +14732,6 @@ msgstr "Creston"
 msgid "Crestview"
 msgstr "Crestview"
 
-#: my-evolution/Locations.h:528
-msgid "Croatia"
-msgstr "Krotia"
-
 #: my-evolution/Locations.h:529
 msgid "Cross City"
 msgstr "Cross City"
@@ -13418,10 +14744,6 @@ msgstr "Crossville"
 msgid "Crotone"
 msgstr "Crotone"
 
-#: my-evolution/Locations.h:532
-msgid "Cuba"
-msgstr "Kuba"
-
 #: my-evolution/Locations.h:533
 msgid "Cuba Awrs"
 msgstr "Cuba Awrs"
@@ -13470,14 +14792,6 @@ msgstr "Cut Bank"
 msgid "Cuzco"
 msgstr "Cuzco"
 
-#: my-evolution/Locations.h:545
-msgid "Cyprus"
-msgstr "Kypros"
-
-#: my-evolution/Locations.h:546
-msgid "Czech Republic"
-msgstr "Tjekkisk republikk"
-
 #: my-evolution/Locations.h:547
 msgid "Dagali"
 msgstr "Dagali"
@@ -13610,10 +14924,6 @@ msgstr "Den Helder/De Kooy"
 msgid "Denison"
 msgstr "Denison"
 
-#: my-evolution/Locations.h:580
-msgid "Denmark"
-msgstr "Danmark"
-
 #: my-evolution/Locations.h:581
 msgid "Denton"
 msgstr "Denton"
@@ -13722,10 +15032,6 @@ msgstr "Doha"
 msgid "Dole"
 msgstr "Dole"
 
-#: my-evolution/Locations.h:608
-msgid "Dominican Republic"
-msgstr "Dominikanske republikk"
-
 #: my-evolution/Locations.h:609
 #, fuzzy
 msgid "Donetsk"
@@ -13855,10 +15161,6 @@ msgstr "East St Louis"
 msgid "Eau Claire"
 msgstr "Eau Claire"
 
-#: my-evolution/Locations.h:641
-msgid "Ecuador"
-msgstr "Ecuador"
-
 #: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr "Edinburgh"
@@ -13891,10 +15193,6 @@ msgstr "Eglin"
 msgid "Eglington/Londonderry"
 msgstr "Eglington/Londonderry"
 
-#: my-evolution/Locations.h:650
-msgid "Egypt"
-msgstr "Egypt"
-
 #: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr "Eindhoven"
@@ -13955,10 +15253,6 @@ msgstr "El Monte"
 msgid "El Paso"
 msgstr "El Paso"
 
-#: my-evolution/Locations.h:666
-msgid "El Salvador"
-msgstr "El Salvador"
-
 #: my-evolution/Locations.h:667
 msgid "El Salvador Int."
 msgstr "El Salvador Int."
@@ -14027,10 +15321,6 @@ msgstr "Eskisehir"
 msgid "Estherville"
 msgstr "Estherville"
 
-#: my-evolution/Locations.h:684
-msgid "Estonia"
-msgstr "Estland"
-
 #: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr "Eugene"
@@ -14155,10 +15445,6 @@ msgstr "Figari"
 msgid "Findlay"
 msgstr "Findlay"
 
-#: my-evolution/Locations.h:716
-msgid "Finland"
-msgstr "Finland"
-
 #: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr "Firenze"
@@ -14355,10 +15641,6 @@ msgstr "Fourchon"
 msgid "Foz Do Iguacu"
 msgstr "Foz Do Iguacu"
 
-#: my-evolution/Locations.h:766
-msgid "France"
-msgstr "Frankrike"
-
 #: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr "Frankfort"
@@ -14535,14 +15817,6 @@ msgstr "George Airport"
 msgid "Georgetown"
 msgstr "Georgetown"
 
-#: my-evolution/Locations.h:811
-msgid "Georgia"
-msgstr "Georgia"
-
-#: my-evolution/Locations.h:812
-msgid "Germany"
-msgstr "Tyskland"
-
 #: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr "Ghardaia"
@@ -14551,10 +15825,6 @@ msgstr "Ghardaia"
 msgid "Ghedi"
 msgstr "Ghedi"
 
-#: my-evolution/Locations.h:815
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
 #: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr "Gifu Ab"
@@ -14675,10 +15945,6 @@ msgstr "Graz"
 msgid "Great Falls"
 msgstr "Great Falls"
 
-#: my-evolution/Locations.h:846
-msgid "Greece"
-msgstr "Hellas"
-
 #: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr "Greeley"
@@ -14759,10 +16025,6 @@ msgstr "Guaratingueta"
 msgid "Guarulhos"
 msgstr "Guarulhos"
 
-#: my-evolution/Locations.h:867
-msgid "Guatemala"
-msgstr "Guatemala"
-
 #: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr "Guayaquil/Simon Bolivar"
@@ -14844,10 +16106,6 @@ msgstr "Hailey-Sun Valley"
 msgid "Haines"
 msgstr "Haines"
 
-#: my-evolution/Locations.h:888
-msgid "Haiti"
-msgstr "Haiti"
-
 #: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr "Hakodate Airport"
@@ -15072,14 +16330,6 @@ msgstr "Homestead AFB"
 msgid "Hondo"
 msgstr "Hondo"
 
-#: my-evolution/Locations.h:945
-msgid "Honduras"
-msgstr "Honduras"
-
-#: my-evolution/Locations.h:946
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
 #: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr "Honningsvåg"
@@ -15156,10 +16406,6 @@ msgstr "Hulien"
 msgid "Humberside"
 msgstr "Humberside"
 
-#: my-evolution/Locations.h:966
-msgid "Hungary"
-msgstr "Ungarn"
-
 #: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr "Huntington"
@@ -15204,10 +16450,6 @@ msgstr "Iasi"
 msgid "Ibiza"
 msgstr "Ibiza"
 
-#: my-evolution/Locations.h:978
-msgid "Iceland"
-msgstr "Island"
-
 #: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr "Ichikawa"
@@ -15256,10 +16498,6 @@ msgstr "Imperial Beach"
 msgid "In Amenas"
 msgstr "In Amenas"
 
-#: my-evolution/Locations.h:991
-msgid "India"
-msgstr "India"
-
 #: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr "Indiana"
@@ -15320,10 +16558,6 @@ msgstr "Iraklion"
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamic Republic of"
 
-#: my-evolution/Locations.h:1007
-msgid "Ireland"
-msgstr "Irland"
-
 #: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr "Iron Mountain"
@@ -15356,10 +16590,6 @@ msgstr "Istanbul"
 msgid "Itaituba"
 msgstr "Itaituba"
 
-#: my-evolution/Locations.h:1016
-msgid "Italy"
-msgstr "Italia"
-
 #: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr "Ithaca"
@@ -15416,10 +16646,6 @@ msgstr "Jacksonville NAS"
 msgid "Jaffrey"
 msgstr "Jaffrey"
 
-#: my-evolution/Locations.h:1031
-msgid "Jamaica"
-msgstr "Jamaica"
-
 #: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr "Jamestown"
@@ -15432,10 +16658,6 @@ msgstr "Janesville"
 msgid "Jan Smuts"
 msgstr "Jan Smuts"
 
-#: my-evolution/Locations.h:1035
-msgid "Japan"
-msgstr "Japansk"
-
 #: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr "Jeddah King Abdul Aziz International Airport"
@@ -15476,10 +16698,6 @@ msgstr "Jonköping"
 msgid "Joplin"
 msgstr "Joplin"
 
-#: my-evolution/Locations.h:1046
-msgid "Jordan"
-msgstr "Jordan"
-
 #: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr "Juanjui"
@@ -15876,10 +17094,6 @@ msgstr "Kunming"
 msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
-#: my-evolution/Locations.h:1146
-msgid "Kuwait"
-msgstr "Kuwait"
-
 #: my-evolution/Locations.h:1147
 msgid "Kyyiv/Boryspil"
 msgstr ""
@@ -16052,10 +17266,6 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1190
-msgid "Latvia"
-msgstr "Latvia"
-
 #: my-evolution/Locations.h:1191
 msgid "Laughlin"
 msgstr "Laughlin"
@@ -16084,10 +17294,6 @@ msgstr "Leadville"
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1198
-msgid "Lebanon"
-msgstr "Libanon"
-
 #: my-evolution/Locations.h:1199
 msgid "Lecce"
 msgstr "Lecce"
@@ -16164,10 +17370,6 @@ msgstr "Lexington"
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1218
-msgid "Liberia"
-msgstr "Liberia"
-
 #: my-evolution/Locations.h:1219
 msgid "Libya"
 msgstr "Libya"
@@ -16228,10 +17430,6 @@ msgstr "Lista"
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1234
-msgid "Lithuania"
-msgstr "Litauen"
-
 #: my-evolution/Locations.h:1235
 msgid "Little Rock"
 msgstr "Little Rock"
@@ -16364,10 +17562,6 @@ msgstr "Luqa"
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1268
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
 #: my-evolution/Locations.h:1269
 msgid "Luxeuil"
 msgstr "Luxeuil"
@@ -16481,10 +17675,6 @@ msgstr "Maldonado/Punta Est"
 msgid "Malmo/Sturup"
 msgstr "Malmö/Sturup"
 
-#: my-evolution/Locations.h:1297
-msgid "Malta"
-msgstr "Malta"
-
 #: my-evolution/Locations.h:1298
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
@@ -16841,10 +18031,6 @@ msgstr "Metz-Frescaty"
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
-msgid "Mexico"
-msgstr "Mexico"
-
 #: my-evolution/Locations.h:1388
 msgid "Miami"
 msgstr "Miami"
@@ -17173,10 +18359,6 @@ msgstr "Morgantown"
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
-msgid "Morocco"
-msgstr "Marokko"
-
 #: my-evolution/Locations.h:1471
 msgid "Morristown"
 msgstr "Morristown"
@@ -17417,10 +18599,6 @@ msgstr "Needles"
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
-msgid "Netherlands"
-msgstr "Nederland"
-
 #: my-evolution/Locations.h:1532
 msgid "Neuquen"
 msgstr "Neuquen"
@@ -17533,18 +18711,10 @@ msgstr "New York-JFK Arpt"
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
-msgid "New Zealand"
-msgstr "Ny Zealand"
-
 #: my-evolution/Locations.h:1561
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
 #: my-evolution/Locations.h:1563
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
@@ -17589,10 +18759,6 @@ msgstr "Nome"
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
-msgid "Norfolk Island"
-msgstr "Norfolk Island"
-
 #: my-evolution/Locations.h:1575
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
@@ -17641,10 +18807,6 @@ msgstr "Northway"
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1587
-msgid "Norway"
-msgstr "Noreg"
-
 #: my-evolution/Locations.h:1588
 msgid "Norwich"
 msgstr "Norwich"
@@ -17822,10 +18984,6 @@ msgstr "Omaha-Bellevue"
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
-msgid "Oman"
-msgstr "Oman"
-
 #: my-evolution/Locations.h:1633
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
@@ -17982,10 +19140,6 @@ msgstr "Paengnyongdo Ab"
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
-msgid "Pakistan"
-msgstr "Pakistan"
-
 #: my-evolution/Locations.h:1674
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
@@ -18022,10 +19176,6 @@ msgstr "Palo Alto"
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
-msgid "Panama"
-msgstr "Panama"
-
 #: my-evolution/Locations.h:1684
 msgid "Panama City"
 msgstr "Panama City"
@@ -18042,10 +19192,6 @@ msgstr "Papa"
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
-msgid "Paraguay"
-msgstr "Paraguay"
-
 #: my-evolution/Locations.h:1689
 msgid "Paris"
 msgstr "Paris"
@@ -18182,10 +19328,6 @@ msgstr "Perry-Foley"
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
-msgid "Peru"
-msgstr "Peru"
-
 #: my-evolution/Locations.h:1724
 msgid "Perugia"
 msgstr "Perugia"
@@ -18346,10 +19488,6 @@ msgstr "Point Piedras Blanca"
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
-msgid "Poland"
-msgstr "Polen"
-
 #: my-evolution/Locations.h:1765
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
@@ -18454,10 +19592,6 @@ msgstr "Port Said"
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
-msgid "Portugal"
-msgstr "Portugal"
-
 #: my-evolution/Locations.h:1792
 msgid "Posadas"
 msgstr "Posadas"
@@ -18586,10 +19720,6 @@ msgstr "Puerto Montt"
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
 #: my-evolution/Locations.h:1825
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
@@ -18634,10 +19764,6 @@ msgstr "Pyongtaek Ab"
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
-msgid "Qatar"
-msgstr "Qatar"
-
 #: my-evolution/Locations.h:1837
 msgid "Quantico"
 msgstr "Quantico"
@@ -18939,10 +20065,6 @@ msgstr "Roma/Ciampino"
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1912
-msgid "Romania"
-msgstr "Romania"
-
 #: my-evolution/Locations.h:1913
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
@@ -19431,10 +20553,6 @@ msgstr "Saskatoon"
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2035
-msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
-
 #: my-evolution/Locations.h:2036
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
@@ -19651,10 +20769,6 @@ msgstr "Silver City"
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2090
-msgid "Singapore"
-msgstr "Singapore"
-
 #: my-evolution/Locations.h:2091
 msgid "Sioux City"
 msgstr "Sioux City"
@@ -19703,14 +20817,6 @@ msgstr "Skwentna"
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: my-evolution/Locations.h:2104
-msgid "Slovenia"
-msgstr "Slovenia"
-
 #: my-evolution/Locations.h:2105
 msgid "Smithers"
 msgstr "Smithers"
@@ -19767,10 +20873,6 @@ msgstr "Songmu Ab"
 msgid "Sorkjosen"
 msgstr "Sørkjosen"
 
-#: my-evolution/Locations.h:2119
-msgid "South Africa"
-msgstr "Sør-Afrika"
-
 #: my-evolution/Locations.h:2120
 msgid "Southampton"
 msgstr "Southampton"
@@ -19799,10 +20901,6 @@ msgstr "South Marsh Island"
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2127
-msgid "Spain"
-msgstr "Spania"
-
 #: my-evolution/Locations.h:2128
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
@@ -19995,10 +21093,6 @@ msgstr "Sungshan/Taipei"
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2176
-msgid "Suriname"
-msgstr "Suriname"
-
 #: my-evolution/Locations.h:2177
 msgid "Sutton"
 msgstr "Sutton"
@@ -20015,18 +21109,10 @@ msgstr "Svalbard"
 msgid "Svolvaer/Helle"
 msgstr "Svolvær/Helle"
 
-#: my-evolution/Locations.h:2181
-msgid "Sweden"
-msgstr "Sverige"
-
 #: my-evolution/Locations.h:2182
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2183
-msgid "Switzerland"
-msgstr "Sveits"
-
 #: my-evolution/Locations.h:2184
 msgid "Sydney"
 msgstr "Sydney"
@@ -20112,10 +21198,6 @@ msgstr "Taif"
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2205
-msgid "Taiwan"
-msgstr "Taiwan"
-
 #: my-evolution/Locations.h:2206
 msgid "Taiyuan"
 msgstr "Taiyuan"
@@ -20576,10 +21658,6 @@ msgstr "Turaif"
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2321
-msgid "Turkey"
-msgstr "Tyrkia"
-
 #: my-evolution/Locations.h:2322
 msgid "Turku"
 msgstr "Turku"
@@ -20628,10 +21706,6 @@ msgstr "Ufa"
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2334
-msgid "Ukraine"
-msgstr "Ukrainia"
-
 #: my-evolution/Locations.h:2335
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
@@ -20660,14 +21734,6 @@ msgstr "Unalakleet"
 msgid "United Arab Emirates "
 msgstr "Sameinte Arabiske Emiratar"
 
-#: my-evolution/Locations.h:2342
-msgid "United Kingdom"
-msgstr "Storbritannia"
-
-#: my-evolution/Locations.h:2343
-msgid "United States"
-msgstr "USA"
-
 #: my-evolution/Locations.h:2344
 msgid "Unst"
 msgstr "Unst"
@@ -20684,10 +21750,6 @@ msgstr "Uruapan"
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2348
-msgid "Uruguay"
-msgstr "Uruguay"
-
 #: my-evolution/Locations.h:2349
 msgid "Urumqi"
 msgstr "Urumqi"
@@ -20813,10 +21875,6 @@ msgstr "Vãxjõ"
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2380
-msgid "Venezuela"
-msgstr "Venezuela"
-
 #: my-evolution/Locations.h:2381
 msgid "Venice"
 msgstr "Venice"
@@ -20861,10 +21919,6 @@ msgstr "Vicksburg"
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2392
-msgid "Viet Nam"
-msgstr "Vietnam"
-
 #: my-evolution/Locations.h:2393
 msgid "Vigo"
 msgstr "Vigo"
@@ -21341,10 +22395,6 @@ msgstr "Yellowknife"
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2512
-msgid "Yemen"
-msgstr "Yemen"
-
 #: my-evolution/Locations.h:2513
 msgid "Yenbo"
 msgstr "Yenbo"
@@ -21389,10 +22439,6 @@ msgstr "Youngstown"
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2524
-msgid "Yugoslavia"
-msgstr "Jugoslavia"
-
 #: my-evolution/Locations.h:2525
 msgid "Yukon"
 msgstr "Yukon"
@@ -21449,114 +22495,137 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
-#, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Avtalar"
 
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "Ingen avtalar"
 
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "Ingen skildring"
 
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Postsamandrag"
 
+#. Make this static, saves having to recompute it each time
+#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
+msgid "VFolders"
+msgstr "vMapper"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+msgid "Local Folders"
+msgstr "Lokale mapper"
+
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "ENOV:ENGM"
 
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictinary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi URLen på den nyhendekjelda du vil leggje til"
 
-#: my-evolution/e-summary-preferences.c:958
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Namn:"
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "Innstillingar for samandrag"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Feil ved nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:444
 msgid "News Feed"
 msgstr "Nyhendekjelde"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Legg til"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "Fje_rn"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Ingen oppgåver"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Ingen skildring)"
 
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mitt vêr"
 
-#: my-evolution/e-summary-weather.c:504
+#: my-evolution/e-summary-weather.c:279
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "Vêr"
 
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "Områder"
-
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Venlegast vent ..."
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut samandrag"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Utskrift av samandrag feila"
 
@@ -21565,38 +22634,6 @@ msgstr "Utskrift av samandrag feila"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr " F"
-
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr " C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "knop"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/t"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "engelske mil"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometer"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -22844,194 +23881,151 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "Fje_rn"
-
-#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "Add n_ews feed"
 msgstr "Legg til nytt bilete"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
-msgid "Al_l stations:"
-msgstr "&Tilgjengelege handlingar:"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All _folders:"
-msgstr "Alle kantar"
-
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
-msgid "All news _feeds:"
-msgstr "&Alle felt"
-
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "C_elsius"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:4
 msgid "How many days should the calendar display at once?"
 msgstr "Kor mange dagar skal kalendaren vise på ein gang?"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
 msgid "Ma_x number of items shown:"
 msgstr "&Høgste tal på hopp:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Nettverksinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:7
 msgid "One mont_h"
 msgstr "Ein _månad"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:8
 msgid "One w_eek"
 msgstr "Ei v_eke"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Vis sidekantar"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:12
 msgid "Show _all tasks"
 msgstr "Vis _alle oppgåver"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show temperatures in:"
 msgstr "Vis temperatur i:"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:15
 msgid "Tasks "
 msgstr "Oppgåver"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Weather settings"
 msgstr "Toppinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Skjermkontrollerarar"
-
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Display stations:"
-msgstr "Visingsval:"
-
-#: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "Vist namn:"
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:17
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Five days"
 msgstr "_Fem dagar"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Mail"
 msgstr "Send"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:21
 msgid "_One day"
 msgstr "_Ein dag"
 
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_Schedule"
 msgstr "&Plan"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Weather"
 msgstr "_Vêr"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-#, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "Øydelagd oppsettfil."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "Øydelagd oppsettfil."
+msgid "Default Folders"
+msgstr "Spesialmapper"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "The Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Vis detaljar"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Avbryt operasjon"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Innboks"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Utboks"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Lokale mapper"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 #, fuzzy
 msgid "Evolution installation"
 msgstr "KDeelop-installering"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Klikk «OK» for å installere filene, eller «Avbryt» for å avslutte."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23041,14 +24035,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "Ein feil oppstod ved lagring."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23058,7 +24052,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23066,7 +24060,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23074,7 +24068,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23082,7 +24076,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23091,7 +24085,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23099,88 +24093,90 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution"
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Opphavsrett © 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Leitar etter tilleggsmodular"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikkje flytta mappe "
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr "kan ikkje opna fila %1"
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 #, fuzzy
 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:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 #, fuzzy
 msgid "Move folder"
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett «%s»"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, 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:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23195,7 +24191,7 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Opprett ny mappe"
 
@@ -23209,7 +24205,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(Utan tittel)"
 
@@ -23371,6 +24367,12 @@ msgstr "Kan ikkje initialisera adresseboka"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kan ikkje initialisera adresseboka"
 
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Ny"
+
 #: shell/e-shell-utils.c:114
 #, fuzzy
 msgid "No folder name specified."
@@ -23394,96 +24396,93 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er resverte mappenamn."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug Buddy vart ikkje funnen i søkestien din ($PATH)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Oppløysing"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:577
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:585
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1660
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23491,20 +24490,24 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:2135
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -23630,83 +24633,81 @@ msgstr "Fj_ern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen frå snarvegstolpen"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Innboks"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Ingen namn)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip å senda."
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mappa er ikkje tom"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje støtta på tenar"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 #, 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-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Leitar etter tilleggsmodular"
@@ -23717,10 +24718,14 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<klikk her for å velje mappe>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -23747,70 +24752,70 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Avbroten"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Har allereide ein eigar"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Ingen eigar"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Ustøtta skjema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Ustøtta operasjon"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "Ikkje noko plass att"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "Gammal eigar har døydd"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "Filtype:"
@@ -23938,33 +24943,50 @@ msgstr "Ikkje spør meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Bruk på følgjande delar:"
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Slå av oppstartsskjerm"
 
-#: shell/main.c:290
+#: shell/main.c:318
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Startar importering"
+
+#: shell/main.c:319
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Startar importering"
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
@@ -23989,264 +25011,222 @@ msgstr "Utdata fil"
 msgid "No filename provided."
 msgstr "Gå til side"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "&Kopier bileteplassering"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopier utval"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Kopier til mappe ..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Opprett ny kontak"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut valde område"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Ny liste"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Lagra side til ascii-fil"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Flytt til _mappe ..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Lim inn frå utklippstavla"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Vel alle"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Vel alle kontatene"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "Sender ei melding til ein nettverksspelar"
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Stopp lasting"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "tid no"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: 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-global.xml.h:14 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "H_andlingar"
 
-#: ui/evolution-addressbook.xml.h:31
-#, fuzzy
-msgid "_Addressbook Sources..."
-msgstr "Kjelde:"
-
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
-
 #: ui/evolution-addressbook.xml.h:33
 #, fuzzy
 msgid "_Contact List"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Vidaresend kontakt ..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "S_kriv ut"
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "Flytt til _mappe ..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Lagra som"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "Slett kolonne"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Vel alt"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a New _Task"
-msgstr "Lagar eit nytt dokument"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Lag ein _ny avtale"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr ""
+msgid "_Send Message to Contact..."
+msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Gå bakover"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Gå framover"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Gå til spesifisert dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Månad"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Ny avtale"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Ny oppgåve"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Førehands_vising av utskrift"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Vis ein dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Vis ein månad"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Vis ei veke"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Veke"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
-msgid "_Appointment..."
-msgstr "Avtale"
-
-#: ui/evolution-calendar.xml.h:36
-#, fuzzy
-msgid "_Calendar Settings..."
-msgstr "Skriftinnstillingar"
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Informasjon"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "_Oppgåve ..."
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -24278,18 +25258,18 @@ msgstr "Sen melding"
 msgid "Print this item"
 msgstr "Skriv ut dette elementet"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Skriv ut ..."
-
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Lagre"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Lagre som ..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -24305,8 +25285,8 @@ msgstr "Lagre dette elementet til disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:40
 msgid "_File"
 msgstr "_Fil"
 
@@ -24324,10 +25304,15 @@ msgstr "L_agre som ..."
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Sender ei melding til ein nettverksspelar"
+
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -24397,6 +25382,10 @@ 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"
@@ -24407,86 +25396,57 @@ msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Tøm _papirkorga"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Ny melding"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Opne eit vindauge for skriving av ei e-postmelding"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Send / Motta"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send køa meldingar og motta ny meldingar"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Vis meldings-førehandsvisningsvindauge"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filter ..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "_Innstillingar for e-post ..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Førehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:23
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "Mottakar"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Leitar etter tilleggsmodular"
@@ -24592,11 +25552,11 @@ msgstr "Mellombels gøym dei valde meldingane"
 msgid "Threaded Message list"
 msgstr "Tråda meldingsliste"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Mappe"
 
@@ -24612,171 +25572,181 @@ msgstr "Ei_genskapar ..."
 msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Legg til avsendar i adresseboka"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Bruk filter"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Legg til avsendar i adresseboka"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Bruk filterreglar på valde meldingar"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "&Kopier bileteplassering"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 #, fuzzy
 msgid "Create a rule to filter messages from this sender"
 msgstr "Slett e-post frå tenaren"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag eit nytt rammesett med denne ramma"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "Vis åtvaringsmelding"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the next unread thread"
 msgstr "Neste ulesne &tråd"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Vidaresend"
+
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Vidaresend"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Vidaresend som"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Vidaresend som _vedlegg"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "Vidaresend _innvevd"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "Fullt _namn ..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Vidaresend _sitert"
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, 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:37
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
@@ -24794,6 +25764,10 @@ msgstr "Last b_ileter"
 msgid "Mark as I_mportant"
 msgstr "Marker som lesen"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Marker som _ulesen"
+
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark as Unimp_ortant"
@@ -24801,22 +25775,22 @@ msgstr "Marker som lesen"
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected message(s) as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
 #: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark the selected messages as important"
+msgid "Mark the selected message(s) as important"
 msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-msgid "Mark the selected messages as not having been read"
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -24830,7 +25804,7 @@ msgstr "Flytt"
 
 #: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Move selected messages to another folder"
+msgid "Move selected message(s) to another folder"
 msgstr "Lagra side til ascii-fil"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -24838,64 +25812,63 @@ msgid "Next"
 msgstr "Neste"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "Neste viktige melding"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "Neste melding"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Neste tråd"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Neste uleste melding"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Opne vald melding i eit eige vindauge"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Opne vald melding for sending på nytt"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Opprinneleg _storleik"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Forrige ulesne melding"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Forrige viktige melding"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Førehandsvis meldinga som skal skrivast ut"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "Forrige viktige melding"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "Forrige melding"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "Forrige ulesne melding"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Skriv ut denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Svar"
+#: ui/evolution-mail-message.xml.h:68
+#, fuzzy
+msgid "Re_direct"
+msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "Svar til alle"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Sentrer dei valte elementa"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -24973,8 +25946,8 @@ msgstr "Ingen emne"
 
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Apply Filters"
-msgstr "Rediger fil"
+msgid "_Attached"
+msgstr "Legg ved"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -24989,43 +25962,72 @@ msgid "_Forward Message"
 msgstr "_Vidaresend melding"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Gå til"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "Innvevd"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Opne melding"
 
-#: ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Sitert"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "Verk_ty"
 
+#: ui/evolution-mail-message.xml.h:112
+#, fuzzy
+msgid "_Undelete"
+msgstr "Slett"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk vindauge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:36
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
 msgid "_View"
 msgstr "_Visning"
 
@@ -25049,11 +26051,11 @@ msgstr "Kryptér denne meldinga med PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Kryptér denne meldinga med ditt S/MIME-krypteringssertifikat"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "Form_at"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
@@ -25069,6 +26071,10 @@ msgstr "Sett inn ei fil som tekst i meldinga"
 msgid "Insert text file..."
 msgstr "Sett inn tekstfil ..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Opne"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Opne ei fil"
@@ -25102,7 +26108,7 @@ msgid "Save in folder..."
 msgstr "Lagre i mappe ..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
@@ -25127,6 +26133,7 @@ msgid "Send _later"
 msgstr "Send _seinare"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Send meldinga i HTML-format"
 
@@ -25195,7 +26202,7 @@ msgid "_From Field"
 msgstr "_Frå felt"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Set _inn"
 
@@ -25207,11 +26214,7 @@ msgstr "_Opne ..."
 msgid "_Reply-To Field"
 msgstr "_Reply-To felt"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Tryggleik"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -25268,43 +26271,41 @@ msgstr "generer avlusingsinformasjon"
 msgid "Re_fresh Task"
 msgstr "_Frisk opp oppgåve"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valde oppgåver"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valde oppgåvr"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Slett valde oppgåver"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Slett valde oppgåver"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Merk som komplett"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgåve frå utklippstavla"
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "Innstillingar for oppgåver ..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Sen melding"
 
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "_Oppgåve"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Skriv ut denne meldinga"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25371,113 +26372,119 @@ msgid "Open this folder in an other window"
 msgstr "Opne denne mappe i eit anna vindauge"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Send / Motta"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Send køa meldingar og motta ny meldingar"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Byt"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Avgjer om snarvegstolpen skal vise"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Vis den valde mappa"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Kopier ..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "_Mappestolpe"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importér ..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Flytt ..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Omdøyp ..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Mottakar"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "_Snarveg"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Endre på innstillingar for samandrag"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut samandrag"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Last om att"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Last om att visning"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Innstillingar for _samandrag ..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adressekort"
@@ -25491,18 +26498,27 @@ msgid "Phone List"
 msgstr "Telefonliste"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Vel mappe"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Etter sendar"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Etter status"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Etter emne"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Meldingar"
 
@@ -25536,11 +26552,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:268
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:324
+#, fuzzy
+msgid "Custom View"
+msgstr "_Aktiv visning"
+
+#: widgets/menus/gal-view-menus.c:333
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:346
 msgid "Define Views"
 msgstr "Definer visningar"
 
@@ -25633,24 +26659,20 @@ msgstr "Ukrainsk"
 msgid "Visual"
 msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:104
-msgid "New"
-msgstr "Ny"
-
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent teiknsett: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Oppgi teiknsett"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Andre ..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Teiknkoding"
 
@@ -25658,30 +26680,32 @@ msgstr "Teiknkoding"
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Redigering av søk"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Legg til lagra søk"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Tøm"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Vis alle"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Legg til lagra søk"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informasjon"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Feil"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Spørsmål"
@@ -25695,11 +26719,21 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Søk"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Finn no"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Tøm"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Tøm"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Finn no"
 
@@ -25725,443 +26759,1023 @@ msgstr "init_corba(): klarte ikkje initialisere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): klarte ikkje å initialisere Bonobo"
 
-#~ msgid "Co_ntacts:"
-#~ msgstr "Ko_ntakter:"
+#~ msgid "Card: "
+#~ msgstr "Kort: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Namn: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefiks:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Fornamn:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Tillegg:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Etternamn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Etterstaving:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Fødselsdato: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Adresse:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postboks:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  Prefix:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gateaddresse:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  By:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Region:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Postnummer: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Land:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Leveringsetikett: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefonar:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-post:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tidssone:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Geo lokasjon: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Forretningsrolle: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Org: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Namn:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ " Eining4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Kategoriar: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Merknad:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Unik streng:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Offentleg nøkkel: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Koplar til LDAP-tenar ..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Ventar på å kople til LDAP-tenar ..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Ny _kontakt"
+
+#~ msgid "New Contact _List"
+#~ msgstr "Ny kontakt_liste"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Rediger adressebok"
+
+#~ msgid "Account Name"
+#~ msgstr "Kontonamn"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Legg til adressebok"
 
-#~ msgid "_Message Recipients:"
-#~ msgstr "_Mottakarar:"
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
 
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#~ msgid "Base"
+#~ msgstr "Base"
 
-#~ msgid "American Samoa"
-#~ msgstr "Amerikansk samoa"
+#~ msgid "Server Name"
+#~ msgstr "Tenarnamn"
 
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Informasjon trengs for å legge til ei addressebok."
 
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Denne informasjonen er ikkje naudsynt for dei fleste ldap-tenarer."
 
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are used "
+#~ "in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Denne informasjonen er brukt av ldap-tenaren for å spesifierse kva nodar som "
+#~ "skal brukast i søket. Kontakt tenaradmistratoren din for meir informasjon."
 
-#~ msgid "Antarctica"
-#~ msgstr "Antarktis"
+#~ msgid "_My server requires authentication"
+#~ msgstr "_Min tenar treng autentisering"
 
-#~ msgid "Antigua And Barbuda"
-#~ msgstr "Antigua og Barbuda"
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
 
-#~ msgid "Armenia"
-#~ msgstr "Armenia"
+#~ msgid "Name contains"
+#~ msgstr "Namn inneheld"
 
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
 
-#~ msgid "Azerbaijan"
-#~ msgstr "Aserbadjan"
+#~ msgid "C_ontaining:"
+#~ msgstr "I_nneheld:"
 
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Vis kontakter som stemmer med desse kriteria:"
 
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Er du sikker på at du vil\n"
+#~ " slette denne kontakta?"
 
-#~ msgid "Belarus"
-#~ msgstr "Kviterussland"
+#~ msgid "Starting:"
+#~ msgstr "Startar:"
 
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "Ending:"
+#~ msgstr "Slutt:"
 
-#~ msgid "Bermuda"
-#~ msgstr "Bermuda"
+#~ msgid "Create a new appointment"
+#~ msgstr "Lag ein ny avtale"
 
-#~ msgid "Bhutan"
-#~ msgstr "Bhutan"
+#~ msgid "Create a new task"
+#~ msgstr "Opprett ei ny oppgåve"
 
-#~ msgid "Bosnia And Herzegowina"
-#~ msgstr "Bosnia og Herzegovina"
+#~ msgid "New _Task"
+#~ msgstr "Ny oppgåve"
 
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "&Slett avtale"
 
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvet Island"
+#~ msgid "First day of wee_k:"
+#~ msgstr "Første ve_kedag:"
 
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britisk Indisk sjøterritorium"
+#~ msgid "_Other"
+#~ msgstr "_Anna"
 
-#~ msgid "British Virgin Islands"
-#~ msgstr "British Virgin Islands"
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Klikke her for å leggje til ein deltakar"
 
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei Darussalam"
+#~ msgid "0%"
+#~ msgstr "0%"
 
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#~ msgid "10%"
+#~ msgstr "10%"
 
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "20%"
+#~ msgstr "20%"
 
-#~ msgid "Cambodia"
-#~ msgstr "Kambodsja"
+#~ msgid "30%"
+#~ msgstr "30%"
 
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "40%"
+#~ msgstr "40%"
 
-#~ msgid "Cape Verde"
-#~ msgstr "Cape Verde"
+#~ msgid "50%"
+#~ msgstr "50%"
 
-#~ msgid "Central African Republic"
-#~ msgstr "Den Sentralafrikanske republikken"
+#~ msgid "60%"
+#~ msgstr "60%"
 
-#~ msgid "Chad"
-#~ msgstr "Tjad"
+#~ msgid "70%"
+#~ msgstr "70%"
 
-#~ msgid "China"
-#~ msgstr "Kina"
+#~ msgid "80%"
+#~ msgstr "80%"
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Cocos (Keeling) Islands"
+#~ msgid "90%"
+#~ msgstr "90%"
 
-#~ msgid "Comoros"
-#~ msgstr "Comoros"
+#~ msgid "100%"
+#~ msgstr "100%"
 
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "_Delete this Task"
+#~ msgstr "Slett _denne oppgåva"
 
-#~ msgid "Cook Islands"
-#~ msgstr "Cook Islands"
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Møtet byrjar: <b>"
 
-#~ msgid "Cote d'Ivoire"
-#~ msgstr "Cote d'Ivoire"
+#~ msgid "Task begins: <b>"
+#~ msgstr "Oppgåva byrjar: <b>"
 
-#~ msgid "Djibouti"
-#~ msgstr "Djibouti"
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Informasjon"
 
-#~ msgid "Dominica"
-#~ msgstr "Dominica"
+#~ msgid "Begins: <b>"
+#~ msgstr "Byrjar: <b>"
 
-#~ msgid "East Timor"
-#~ msgstr "Aust-timor"
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Informasjon"
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Ekvatorial Guinea"
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Informasjon"
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Ends: <b>"
+#~ msgstr "Sluttar: <b>"
 
-#~ msgid "Ethiopia"
-#~ msgstr "Etiopia"
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Ferdig"
 
-#~ msgid "Falkland Islands"
-#~ msgstr "Falklandsøyane"
+#~ msgid "Task Due: <b>"
+#~ msgstr "Oppgåva ferdig: <b>"
 
-#~ msgid "Faroe Islands"
-#~ msgstr "Færøyane"
+#, fuzzy
+#~ msgid "iCalendar Information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Fiji"
-#~ msgstr "Fiji"
+#, fuzzy
+#~ msgid "iCalendar Error"
+#~ msgstr "Skriv ut alle"
 
-#~ msgid "French Guiana"
-#~ msgstr "French Guiana"
+#~ msgid "An unknown person"
+#~ msgstr "Ein ukjent person"
 
-#~ msgid "French Polynesia"
-#~ msgstr "French Polynesia"
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
+#~ "under."
 
-#~ msgid "French Southern Territories"
-#~ msgstr "Fransk sørleg territoriar"
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ingen</i>"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "Choose an action:"
+#~ msgstr "Vel ei handling:"
 
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "Update"
+#~ msgstr "Oppdater"
 
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Accept"
+#~ msgstr "Godta"
 
-#~ msgid "Greenland"
-#~ msgstr "Grønland"
+#, fuzzy
+#~ msgid "Tentatively accept"
+#~ msgstr "Mellombels"
 
-#~ msgid "Grenada"
-#~ msgstr "Grenada"
+#~ msgid "Decline"
+#~ msgstr "Avslå"
 
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#, fuzzy
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid "Update respondent status"
+#~ msgstr "Opdatér status på svar"
 
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#, fuzzy
+#~ msgid "Send Latest Information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Guinea-bissau"
-#~ msgstr "Guinea-bissau"
+#, fuzzy
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "generer avlusingsinformasjon"
 
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
+#, fuzzy
+#~ msgid "Meeting Information"
+#~ msgstr "Personleg informasjon"
 
-#~ msgid "Heard And McDonald Islands"
-#~ msgstr "Heard And McDonald Islands"
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> spør etter deg for å stille opp på eit møte."
 
-#~ msgid "Holy See"
-#~ msgstr "Den heilage sjø"
+#~ msgid "Meeting Proposal"
+#~ msgstr "Møteframlegg"
 
-#~ msgid "Indonesia"
-#~ msgstr "Indonesia"
+#~ msgid "Meeting Update"
+#~ msgstr "Møteoppdatering"
 
-#~ msgid "Israel"
-#~ msgstr "Israel"
+#, fuzzy
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "generer avlusingsinformasjon"
 
-#~ msgid "Kazakhstan"
-#~ msgstr "Kasakstan"
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "Dette er ei repeterande hending."
 
-#~ msgid "Kenya"
-#~ msgstr "Kenya"
+#~ msgid "Meeting Reply"
+#~ msgstr "Møtesvar"
 
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Møtekansellering"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgistan"
+#, fuzzy
+#~ msgid "Bad Meeting Message"
+#~ msgstr "&Finn i melding ..."
 
-#~ msgid "Laos"
-#~ msgstr "Laos"
+#~ msgid "Task Information"
+#~ msgstr "Oppgåveinformasjon"
 
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#~ msgid "Task Proposal"
+#~ msgstr "Oppgåveframlegg"
 
-#~ msgid "Liechtenstein"
-#~ msgstr "Liechtenstein"
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> ønskjar å leggje til ei eksisterande oppgåve."
 
-#~ msgid "Macau"
-#~ msgstr "Macau"
+#~ msgid "Task Update"
+#~ msgstr "Oppgåveoppdatering"
 
-#~ msgid "Macedonia"
-#~ msgstr "Makedonia"
+#, fuzzy
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
 
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
+#~ msgid "Task Update Request"
+#~ msgstr "Oppgåveoppdateringsforepørjing"
 
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "Dette er ei repeterande hending."
 
-#~ msgid "Malaysia"
-#~ msgstr "Malaysia"
+#~ msgid "Task Reply"
+#~ msgstr "Oppgåvesvar"
 
-#~ msgid "Maldives"
-#~ msgstr "Maldivane"
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> har kansellert ei oppgåve."
 
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Task Cancellation"
+#~ msgstr "Oppgåvekansellering"
 
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshall Islands"
+#, fuzzy
+#~ msgid "Bad Task Message"
+#~ msgstr "Skriv ut alle"
 
-#~ msgid "Martinique"
-#~ msgstr "Martinique"
+#, fuzzy
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "Skriv avlusingsinformasjon"
 
-#~ msgid "Mauritania"
-#~ msgstr "Mauritania"
+#~ msgid "Free/Busy Information"
+#~ msgstr "Fri/ledig-informasjon"
 
-#~ msgid "Mauritius"
-#~ msgstr "Mauritius"
+#, fuzzy
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
+#~ msgid "Free/Busy Request"
+#~ msgstr "Fri/ledig forespørsel"
 
-#~ msgid "Micronesia"
-#~ msgstr "Mikronesia"
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "Dette er ei repeterande hending."
 
-#~ msgid "Monaco"
-#~ msgstr "Monaco"
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Fri/Oppteke svar"
 
-#~ msgid "Mongolia"
-#~ msgstr "Mongolia"
+#, fuzzy
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Private meldingar"
 
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#, fuzzy
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Meldinga har ingen sendar"
 
-#~ msgid "Mozambique"
-#~ msgstr "Mozambique"
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
+#, fuzzy
+#~ msgid "Event information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Namibia"
-#~ msgstr "Namibia"
+#~ msgid "Task information"
+#~ msgstr "Informasjon om oppgåve"
 
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#, fuzzy
+#~ msgid "Journal information"
+#~ msgstr "Personleg informasjon"
 
-#~ msgid "Nepal"
-#~ msgstr "Nepal"
+#, fuzzy
+#~ msgid "Free/Busy information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Nederlandske antillar"
+#, fuzzy
+#~ msgid "Calendar information"
+#~ msgstr "Informasjon"
 
-#~ msgid "New Caledonia"
-#~ msgstr "New Caledonia"
+#, fuzzy
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Informasjon"
 
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#, fuzzy
+#~ msgid "iCalendar information"
+#~ msgstr "Informasjon"
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
+#~ msgid "Task"
+#~ msgstr "Oppgåve"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Northern Mariana Islands"
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Prosent ferdig: %i"
 
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
 
-#~ msgid "Palestinian Territory"
-#~ msgstr "Palestina"
+#~ msgid "Categories: %s"
+#~ msgstr "Kategoriar %s"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua New Guinea"
+#~ msgid "Contacts: "
+#~ msgstr "Kontaktar: "
 
-#~ msgid "Philippines"
-#~ msgstr "Fillipinene"
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Feil ved tilleggjing av kort"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairn"
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "Ugyldig argument"
 
-#~ msgid "Republic Of Korea"
-#~ msgstr "Republic Of Korea"
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikkje lasta biletet '%1'\n"
 
-#~ msgid "Republic Of Moldova"
-#~ msgstr "Moldovia"
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikkje lasta biletet '%1'\n"
 
-#~ msgid "Reunion"
-#~ msgstr "Reunion"
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#~ msgid "Russian Federation"
-#~ msgstr "Russland"
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Klarte ikkje å lagre signaturfil."
 
-#~ msgid "Saint Kitts And Nevis"
-#~ msgstr "Saint Kitts And Nevis"
+#~ msgid "NT Login"
+#~ msgstr "NT Login"
 
-#~ msgid "Saint Lucia"
-#~ msgstr "Saint Lucia"
+#~ msgid "Server rejected username"
+#~ msgstr "Tenaren avslo brukarnamnet"
 
-#~ msgid "Saint Vincent And The Grena-dines"
-#~ msgstr "Saint Vincent And The Grena-dines"
+#, fuzzy
+#~ msgid "Could not get group list from server."
+#~ msgstr "Kunne ikkje starta underprosess."
 
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#, fuzzy
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "San Marino"
-#~ msgstr "San Marino"
+#, fuzzy
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Vidaresendt melding frå %1"
 
-#~ msgid "Sao Tome And Principe"
-#~ msgstr "Sao Tome And Principe"
+#, fuzzy
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Slett e-post frå tenaren"
 
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#, fuzzy
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Kunne ikkje starta underprosess."
 
-#~ msgid "Seychelles"
-#~ msgstr "Seychellene"
+#, fuzzy
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "(Unknown)"
+#~ msgstr "(Ukjend)"
 
-#~ msgid "Solomon Islands"
-#~ msgstr "Solomon Islands"
+#~ msgid "Unexpected response from POP server: %s"
+#~ msgstr "Uventa svar frå POP-tenaren: %s"
 
-#~ msgid "Somalia"
-#~ msgstr "Somalia"
+#, fuzzy
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Vidaresendt melding frå %1"
 
-#~ msgid "South Georgia And The South Sandwich Islands"
-#~ msgstr "South Georgia And The South Sandwich Islands"
+#, fuzzy
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
 
-#~ msgid "St. Helena"
-#~ msgstr "St. Helena"
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "Vel ei fil"
 
-#~ msgid "St. Pierre And Miquelon"
-#~ msgstr "St. Pierre And Miquelon"
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Send ein e-post"
 
-#~ msgid "Sudan"
-#~ msgstr "Sudan"
+#, fuzzy
+#~ msgid "Run %s"
+#~ msgstr "URL: %s"
 
-#~ msgid "Svalbard And Jan Mayen Islands"
-#~ msgstr "Svalbard og Jan Mayen"
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Lukk"
 
-#~ msgid "Swaziland"
-#~ msgstr "Swaziland"
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Flytt denne mappa til ein annan plass"
 
-#~ msgid "Tajikistan"
-#~ msgstr "Tajikistan"
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "Side"
 
-#~ msgid "Thailand"
-#~ msgstr "Thailand"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "Feil ved asting av %s"
 
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#, fuzzy
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Øydelagd oppsettfil."
 
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Samandrag"
 
-#~ msgid "Trinidad And Tobago"
-#~ msgstr "Trinidad og Tobago"
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Øydelagd oppsettfil."
 
-#~ msgid "Tunisia"
-#~ msgstr "Tunisia"
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Øydelagd oppsettfil."
 
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkmenistan"
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Estherville"
 
-#~ msgid "Turks And Caicos Islands"
-#~ msgstr "Turks And Caicos Islands"
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Oppdater"
 
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "Oppdateringsfrekvens"
 
-#~ msgid "U.S. Virgin Islands"
-#~ msgstr "U.S. Virgin Islands"
+#, fuzzy
+#~ msgid "Needs Reply"
+#~ msgstr "Fri/Oppteke svar"
 
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "E-post lagrinsmappe (intern)"
 
-#~ msgid "United Arab Emirates"
-#~ msgstr "Forente Arabiske Emirater"
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Ny e-post_melding"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Lag vFolder frå søk"
+
+#, fuzzy
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "Møtesvar"
+
+#, fuzzy
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "Møtesvar"
+
+#, fuzzy
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Fil alt i liste"
+
+#~ msgid "Default"
+#~ msgstr "Forvald"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indekserar"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Postkasseformat"
 
-#~ msgid "United Republic Of Tanzania"
-#~ msgstr "Tanzania"
+#~ msgid " (default)"
+#~ msgstr " (standard)"
 
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "United States Minor Outlying Islands"
+#~ msgid "Mail Settings"
+#~ msgstr "Innstillingar for e-post"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Emne er %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Melding frå %s"
+
+#, fuzzy
+#~ msgid "%s mailing list"
+#~ msgstr "E-post&liste for språket:"
+
+#, fuzzy
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "Meldinga har ingen sendar"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: innboks"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgid "Composer"
+#~ msgstr "Meldingsskrivar"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Standard vidaresendingsstil er: "
+
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Drafts"
+#~ msgstr "Kladd"
+
+#~ msgid "Edit..."
+#~ msgstr "Rediger ..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML-signaturfil:"
+
+#~ msgid "News"
+#~ msgstr "Nyhende"
+
+#, fuzzy
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid "Sources"
+#~ msgstr "Kjelder"
+
+#, fuzzy
+#~ msgid "_Email Address:"
+#~ msgstr "E-post-adresse:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "_Loggfør filterhandlingar til:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organisasjon:"
+
+#, fuzzy
+#~ msgid "_Remember this password"
+#~ msgstr "Fjern denne oppføringa"
+
+#, fuzzy
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Send meldingar:"
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Tenartype: "
+
+#~ msgid "_Signature file:"
+#~ msgstr "_Signaturfil:"
+
+#, fuzzy
+#~ msgid "placeholder"
+#~ msgstr "Bruk &plasshaldarar"
+
+#~ msgid "seconds."
+#~ msgstr "sekund."
+
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Postsamandrag"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
 
-#~ msgid "Uzbekistan"
-#~ msgstr "Usbekistan"
+#~ msgid "Regions"
+#~ msgstr "Områder"
 
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
+#~ msgid " F"
+#~ msgstr " F"
 
-#~ msgid "Wallis And Futuna Islands"
-#~ msgstr "Wallis And Futuna Islands"
+#~ msgid " C"
+#~ msgstr " C"
 
-#~ msgid "Western Sahara"
-#~ msgstr "Western Sahara"
+#~ msgid "knots"
+#~ msgstr "knop"
 
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
+#~ msgid "kph"
+#~ msgstr "km/t"
 
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "engelske mil"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometer"
+
+#, fuzzy
+#~ msgid "Al_l stations:"
+#~ msgstr "&Tilgjengelege handlingar:"
+
+#, fuzzy
+#~ msgid "All _folders:"
+#~ msgstr "Alle kantar"
+
+#, fuzzy
+#~ msgid "All news _feeds:"
+#~ msgstr "&Alle felt"
+
+#, fuzzy
+#~ msgid "_Display folders:"
+#~ msgstr "Skjermkontrollerarar"
+
+#, fuzzy
+#~ msgid "_Display stations:"
+#~ msgstr "Visingsval:"
+
+#, fuzzy
+#~ msgid "_Displayed feeds:"
+#~ msgstr "Vist namn:"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Øydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Øydelagd oppsettfil."
+
+#~ msgid "Outbox"
+#~ msgstr "Utboks"
+
+#~ msgid "Evolution "
+#~ msgstr "Evolution"
+
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "Opphavsrett © 1999, 2000, 2001 Ximian, Inc."
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#~ msgid "(No name)"
+#~ msgstr "(Ingen namn)"
+
+#~ msgid "New List"
+#~ msgstr "Ny liste"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Create a New _Task"
+#~ msgstr "Lagar eit nytt dokument"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Lag ein _ny avtale"
+
+#, fuzzy
+#~ msgid "_Appointment..."
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#~ msgid "_Task..."
+#~ msgstr "_Oppgåve ..."
+
+#~ msgid "New Message"
+#~ msgstr "Ny melding"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Innstillingar for e-post ..."
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Vidaresend som _vedlegg"
+
+#~ msgid "Forward _Inline"
+#~ msgstr "Vidaresend _innvevd"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Vidaresend _sitert"
+
+#, fuzzy
+#~ msgid "_Apply Filters"
+#~ msgstr "Rediger fil"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Innstillingar for oppgåver ..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Endre på innstillingar for samandrag"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Innstillingar for _samandrag ..."
+
+#~ msgid "Show All"
+#~ msgstr "Vis alle"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Søk"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Ko_ntakter:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "_Mottakarar:"
+
+#~ msgid "British Virgin Islands"
+#~ msgstr "British Virgin Islands"
+
+#~ msgid "Republic Of Korea"
+#~ msgstr "Republic Of Korea"
+
+#~ msgid "Republic Of Moldova"
+#~ msgstr "Moldovia"
 
 #~ msgid "Message %s not found."
 #~ msgstr "Melding %s ikkje funnen."
@@ -26178,9 +27792,6 @@ msgstr "init_bonobo(): klarte ikkje å initialisere Bonobo"
 #~ msgid "on or before"
 #~ msgstr "på eller før"
 
-#~ msgid "Special Folders"
-#~ msgstr "Spesialmapper"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Klarte ikkje å kontakte vêrtenaren</b></dd>"
author	JP Rosevear <jpr@ximian.com>	2002-05-08 21:37:33 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2002-05-08 21:37:33 +0800
commit	b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree	5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/nn.po
parent	d02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
download	gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip