Sync for 0.13.

svn path=/trunk/; revision=12408

1 files changed, 3720 insertions, 2090 deletions

diff --git a/po/nn.po b/po/nn.po
index e9cfae8df8..60dbaf36c7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 # Kjartan Maraas  <kmaraas@gnome.org>, 2001.
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-08-08 14:48+0200\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -22,209 +23,209 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "mellombels feil i namneoppslag"
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3595
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3597
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3602
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3622
+#: addressbook/backend/ebook/e-card.c:3616
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3627
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3634
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3635
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3654
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3669
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3687
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3690
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3721
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3729
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3727
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3746
+#: addressbook/backend/ebook/e-card.c:3740
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3748
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3749
 #, fuzzy
 msgid ""
 "\n"
@@ -241,25 +242,25 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3765
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#: addressbook/backend/ebook/e-card.c:4043
+#: addressbook/backend/ebook/e-card.c:4037
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "&Fleire spelarar"
 
-#: addressbook/backend/ebook/e-card.c:4051
+#: addressbook/backend/ebook/e-card.c:4045
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Kort 1:"
@@ -268,7 +269,7 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/conduit/address-conduit.c:1100
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
@@ -284,22 +285,22 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: calendar/conduits/calendar/calendar-conduit.c:778
 #: calendar/conduits/todo/todo-conduit.c:592
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:655
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -353,216 +354,220 @@ msgstr "Øydelagd oppsettfil."
 msgid "Factory for the sample Addressbook control"
 msgstr "Legg adresse til adresseboka"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
 #, fuzzy
-msgid "LDAP Server"
-msgstr "Tenar:"
+msgid "Contacts"
+msgstr "&Innhald ..."
 
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/component/addressbook-component.c:68
 #, fuzzy
-msgid "File"
-msgstr "Fil"
+msgid "Folder containing contact information"
+msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Kan ikkje opna adresseboka."
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:51
-msgid "Password"
-msgstr ""
+msgid "New Contact"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:168
+#: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
-msgid "Unknown auth type"
-msgstr "Ukjend feil"
+msgid "New _Contact"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Base"
-msgstr "Lim inn"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr ""
+msgid "New Contact List"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-component.c:387
 #, fuzzy
-msgid "Subtree"
-msgstr "Kjelder"
+msgid "New Contact _List"
+msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "Små ikon"
 
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:403
+#: addressbook/gui/component/addressbook-config.glade.h:4
 #, fuzzy
-msgid "Host:"
-msgstr "time/timar"
+msgid "Addressbook Sources"
+msgstr "Kjelde:"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook-config.c:406
+#: addressbook/gui/component/addressbook-config.glade.h:6
 #, fuzzy
-msgid "Root DN:"
-msgstr "Rot"
+msgid "Base"
+msgstr "Lim inn"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "KBasic"
 
-#: addressbook/gui/component/addressbook-config.c:411
+#: addressbook/gui/component/addressbook-config.glade.h:8
 #, fuzzy
-msgid "Port:"
-msgstr "Prioritet:"
+msgid "De_lete"
+msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
+#: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
-msgid "Search Scope:"
+msgid "Search _base:"
 msgstr "Søk"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: addressbook/gui/component/addressbook-config.c:501
+#: addressbook/gui/component/addressbook-config.glade.h:11
 #, fuzzy
-msgid "Advanced LDAP Options"
-msgstr "Avanserte kISDN-val"
-
-#: addressbook/gui/component/addressbook-config.c:522
-msgid "Path:"
-msgstr "Sti:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:528
-#, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Fila finst ikkje\n"
+msgid "Search s_cope: "
+msgstr "Søk"
 
-#: addressbook/gui/component/addressbook-config.c:663
+#: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "KDE adressebok"
+msgid "Server Name"
+msgstr "Merk område"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "KDE adressebok"
+msgid "Sub"
+msgstr "Sum"
 
-#: addressbook/gui/component/addressbook-config.c:683
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:691
-#: my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Navn:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:694
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Skildring:"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+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 ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Kjelde:"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "De_lete"
-msgstr "Slett"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Namn"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, fuzzy
-msgid "URI"
-msgstr "URL"
+msgid "_Account name:"
+msgstr "Små ikon"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:87
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "_Add"
 msgstr "Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:92 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: addressbook/gui/component/addressbook-storage.c:131
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "Prioritet:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "Lagra melding"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/addressbook.c:379
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "Oppgi ditt OpenPGP-passord"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook.c:405
+#, fuzzy
+msgid "Email Address:"
+msgstr "E-post-adresse:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "Lagra som"
+
+#: addressbook/gui/component/addressbook.c:481
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:488
 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:419
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -570,7 +575,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:501
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -580,32 +585,41 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:578
-#: calendar/gui/cal-search-bar.c:54
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:579
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:580
+#: addressbook/gui/component/addressbook.c:644
 #, fuzzy
 msgid "Email contains"
 msgstr "Små ikon"
 
-#: addressbook/gui/component/addressbook.c:581
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "Spørjinga inneheld"
+msgid "Category is"
+msgstr "Kategoriar"
 
-#: addressbook/gui/component/addressbook.c:582 widgets/misc/e-filter-bar.h:97
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook.c:741
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Kategoriar"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -620,20 +634,20 @@ msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Primær e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
@@ -658,20 +672,20 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "A&dressebok ..."
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:383
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "E-post-adresse:"
@@ -696,13 +710,10 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:634
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:205
-#: shell/e-shortcuts-view.c:414
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Fjern"
 
@@ -721,35 +732,52 @@ msgstr "&Send e-post"
 msgid "Unnamed Contact"
 msgstr "Endra skrift"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
-msgid "Message Recipients"
-msgstr "Melding motteken"
+msgid "C_ontaining:"
+msgstr "Handlingar"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Select Names"
-msgstr "Merk område"
+msgid "Co_ntacts:"
+msgstr "&Innhald ..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "Vel ei gruppe først."
+msgid "F_ind"
+msgstr "Finn:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
+msgid "Select Names"
+msgstr "Merk område"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
 msgid "_Category:"
 msgstr "Kategoriar"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
-msgid "_Search"
-msgstr "Søk"
+msgid "_Folder:"
+msgstr "Mapper"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Melding motteken"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #, fuzzy
@@ -768,7 +796,7 @@ msgstr "Firma-fax"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
@@ -779,17 +807,16 @@ msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detaljar"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
-msgid "File As:"
+msgid "File A_s:"
 msgstr "Arkiver som"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Generelt"
 
@@ -814,222 +841,229 @@ msgstr "Telefontypar"
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
-msgid "Web page address:"
-msgstr "&WINS-adresse:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
 msgid "_Address..."
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Assistant's name:"
 msgstr "&Namn på assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "_Birthday:"
 msgstr "Fødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #, fuzzy
 msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:20
+#: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:91 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:42
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "_Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "Na_mn på sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Rediger e-post-adresser"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "&WINS-adresse:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn på assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: e-util/e-categories-config.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1513
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1514
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1515
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1516
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1517
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1518
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1519
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: mail/mail-config.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1521
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1522
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1524
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1525
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 #, fuzzy
 msgid "Edit Full"
 msgstr "Rediger fil"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:772
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 #, fuzzy
 msgid "Full Name"
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post 2"
@@ -1048,49 +1082,1042 @@ msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 #, fuzzy
+msgid "Afghanistan"
+msgstr "Namn på assistent"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "Automatisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "Retning"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "August"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "år"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Storleik"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "Sender %1"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#, fuzzy
+msgid "Bouvet Island"
+msgstr "moderert"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+#, fuzzy
 msgid "Canada"
 msgstr "Skriv ut alle"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "Teikn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 #, fuzzy
 msgid "Check Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Name=Kinesisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Name=Kinesisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "Lukk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopierer"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 #, fuzzy
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 #, fuzzy
 msgid "Finland"
 msgstr "Finn ..."
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Avbryt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "Gresk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "am"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "Generelt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "time/timar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Sundag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr " dag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Koreansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#, fuzzy
+msgid "Japan"
+msgstr "Japansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Koreansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "Senk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "Senk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "seriell"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#, fuzzy
+msgid "Lithuania"
+msgstr "Lyssetjing"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Mars"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#, fuzzy
+msgid "Marshall Islands"
+msgstr "Marshalløyane"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "Marger"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Måndag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "Måndag"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "Mobil:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "Personsøkjar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "Svar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Vel mappe"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "&Ny kontakt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "Høgd"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "seriell"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minutt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "&No"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Lim inn"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "Papir"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Ståande"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "Slutt etter"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "Start om att"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "modem"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "Generelt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr "&Plan"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "Normal"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "og"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "Sun"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Kallenamn:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "Resultat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Oppgåver"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Finn ..."
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Til"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Tonga"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "Tys"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Brasiliansk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "Ulest melding"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "Merk område"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#, fuzzy
+msgid "Western Sahara"
+msgstr "Vesteuropeisk"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Send"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 #, fuzzy
 msgid "_Address:"
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 #, fuzzy
 msgid "_City:"
 msgstr "Stad:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 #, fuzzy
 msgid "_PO Box:"
 msgstr "Postboks"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 #, fuzzy
 msgid "_State/Province:"
 msgstr "Stat/provins"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 #, fuzzy
 msgid "_ZIP Code:"
 msgstr "ZIP/Postnummer"
@@ -1189,6 +2216,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Fjern"
@@ -1199,7 +2227,7 @@ msgid "contact-list-editor"
 msgstr "Comment=X-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Comment=X-redigering"
@@ -1210,7 +2238,7 @@ msgid "Add Anyway"
 msgstr "Legg til &ny"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 #, fuzzy
 msgid "Duplicate Contact Detected"
 msgstr "Lag kopi av side"
@@ -1233,33 +2261,33 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
+msgid "Change Anyway"
+msgstr "Endra vinkel"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
 msgid "Changed Contact:"
 msgstr "Endra skrift"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Conflicting Contact:"
 msgstr "Koplar til: "
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
-#, fuzzy
-msgid "_Change Anyway"
-msgstr "Endra vinkel"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:241
+#: widgets/misc/e-filter-bar.c:243
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Legg til ..."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Søk"
 
@@ -1390,49 +2418,55 @@ msgstr "av"
 msgid "z"
 msgstr "Hz"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:670
-#: addressbook/gui/widgets/e-addressbook-view.c:1282
-#: ui/evolution-addressbook.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:671
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "Opna ..."
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: ui/evolution-addressbook.xml.h:26
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Send message to contact"
+msgid "Forward Contact"
+msgstr "Smarte vedlegg"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Private meldingar"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:675 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Slett"
 
@@ -1448,8 +2482,8 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1589
-#: shell/e-storage.c:501
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1458,7 +2492,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -1480,9 +2514,12 @@ msgstr ""
 "%1"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
-msgstr "Avbroten."
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
+msgstr "Avbroten"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
@@ -1514,147 +2551,147 @@ msgid "Error removing list"
 msgstr "Feil ved fjerning av oppsett"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1155
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:770
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "Trykk her for å leggja til ein ny virtuell vert."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:771
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:773
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 #, fuzzy
 msgid "Company Phone"
 msgstr "Hovudtelefon til firmaet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 #, fuzzy
 msgid "Manager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1152
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1184
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "&Suspender ..."
@@ -1862,6 +2899,23 @@ msgstr "Breidd:"
 msgid "_Font..."
 msgstr "Skrifttype ..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Skriv ut alle"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Skriv ut alle"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "Private meldingar"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 #, fuzzy
@@ -2041,37 +3095,46 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:414
 #, 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:408 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1353 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%1 bit %2 %3"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:426 calendar/gui/calendar-commands.c:431
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:439
-#: widgets/misc/e-calendar-item.c:1068
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "Id"
+
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
 #, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
+msgid "%d %B %Y"
+msgstr "%1 bit %2 %3"
 
-#: calendar/gui/calendar-commands.c:429
-msgid "%B"
-msgstr ""
+#. 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:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+#, fuzzy
+msgid "%d %B"
+msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:575
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2111,22 +3174,22 @@ msgid "W"
 msgstr "RW"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:639
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 #, fuzzy
 msgid "High"
 msgstr "Høgd"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:638
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:637
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
@@ -2143,41 +3206,34 @@ msgid "Busy"
 msgstr "Oppteke"
 
 #: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:401
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
 #: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:402
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
 #: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Avbroten"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
@@ -2206,20 +3262,19 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1105
-#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1394
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:388
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1375
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
-#: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Ingen"
 
@@ -2232,15 +3287,15 @@ msgstr "Repetering"
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 #, fuzzy
 msgid "No"
 msgstr "&No"
@@ -2264,62 +3319,94 @@ msgstr "&Trevising"
 msgid "Month View"
 msgstr "Månadsvising"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 #, fuzzy
 msgid "Summary contains"
 msgstr "Spørjinga inneheld"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 #, fuzzy
 msgid "Description contains"
 msgstr "Skildringar"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 #, fuzzy
 msgid "Comment contains"
 msgstr "ikkje inneheld"
 
-#: calendar/gui/cal-search-bar.c:349
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
 #, fuzzy
-msgid "Category:"
-msgstr "Kategoriar"
+msgid "Calendar"
+msgstr "Skriv ut alle"
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:469
-msgid "All"
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:474
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Oppgåver"
+
+#: calendar/gui/component-factory.c:56
 #, fuzzy
-msgid "Unfiled"
-msgstr "Utan tittel"
+msgid "Folder containing to-do items"
+msgstr "Fil alt i liste"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "&Vis avtale ..."
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Create a new task"
+msgstr "Lagar eit nytt dokument"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "Oppgåve"
 
 #: calendar/gui/control-factory.c:128
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Eigenskapar for meldingsdel"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Tar-val"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 #, fuzzy
 msgid "Program Alarm Options"
 msgstr "Programplasseringar"
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 #, fuzzy
 msgid "Unknown Alarm Options"
 msgstr "Kjende program"
@@ -2378,120 +3465,117 @@ msgstr "time/timar"
 msgid "minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " dag"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr "Vis dato"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Veke"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr "Vis %1"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Vis åtvaringsmelding"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
 msgid "Send an email"
 msgstr "Hentar data frå %1"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Run a program"
 msgstr "Terminalprogram:"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
 msgid "Basics"
 msgstr "KBasic"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Dato/tid"
@@ -2502,9 +3586,8 @@ msgid "Reminders"
 msgstr "Påminning:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -2514,13 +3597,12 @@ msgstr "Samandrag:"
 msgid "_Options..."
 msgstr "Val ..."
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "after"
 msgstr "Slutt etter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr ""
 
@@ -2539,7 +3621,7 @@ msgstr "&Slett avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:112
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutt"
@@ -2560,184 +3642,235 @@ msgid "10 minutes"
 msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr ""
+#, fuzzy
+msgid "15 minutes"
+msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 #, fuzzy
-msgid "15 minutes"
+msgid "30 minutes"
 msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 #, fuzzy
-msgid "24 hour"
-msgstr "time/timar"
+msgid "60 minutes"
+msgstr "minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "30 minutes"
-msgstr "minutt"
+msgid "Calendar and Tasks Settings"
+msgstr "Skriftinnstillingar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
-msgid "60 minutes"
-msgstr "minutt"
+msgid "Color for overdue tasks"
+msgstr "Farge for &siterte teikn:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, fuzzy
-msgid "Calendar Preferences"
-msgstr "Innstillingar"
+msgid "Color for tasks due today"
+msgstr "Farge eller pixmap"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Color for overdue tasks"
-msgstr "Farge for &siterte teikn:"
+msgid "Create new appointments with a default _reminder"
+msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
-msgid "Color for tasks due today"
-msgstr "Farge eller pixmap"
+msgid "Days"
+msgstr "Dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Compress weekends in month view"
+msgid "First day of wee_k:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:25
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Display"
-msgstr "Vis"
+msgid "Friday"
+msgstr "Fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
-msgid "End of day:"
-msgstr "Slutt trekk"
+msgid "Hours"
+msgstr "time/timar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Friday"
-msgstr "Fredag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "Mån"
+msgid "Minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #, fuzzy
-msgid "Overdue tasks:"
+msgid "O_verdue tasks:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "Lau"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
-msgid "Show appointment end times in week and month views"
+msgid "Show appointment _end times in week and month views"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
-msgid "Show week numbers in date navigator"
+msgid "Show week _numbers in date navigator"
 msgstr "Vis %1"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #, fuzzy
-msgid "Start of day:"
+msgid "Sta_rt of day:"
 msgstr "Start-dato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "Su_n"
 msgstr "Sun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sundag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Task List"
-msgstr "Oppgåver"
+msgid "T_hu"
+msgstr "Tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
-msgid "Tasks due today:"
-msgstr "&Opplys syntaks"
+msgid "T_ue"
+msgstr "Tys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "Tor"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "&Opplys syntaks"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr "Tidssone:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
-msgid "Time divisions:"
+msgid "Time di_visions:"
 msgstr "Dimensjonar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "Time format:"
 msgstr "Tidsformat:"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
+#, fuzzy
+msgid "Tuesday"
+msgstr "Tysdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
+#, fuzzy
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "&Arbeidsveke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "_12 hour (AM/PM)"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
-msgid "Time zone:"
-msgstr "Tidssone:"
+msgid "_24 hour"
+msgstr "time/timar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Tys"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-#, fuzzy
-msgid "Tuesday"
-msgstr "Tysdag"
+msgid "_Compress weekends in month view"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Ons"
+#, fuzzy
+msgid "_Display"
+msgstr "Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
 #, fuzzy
-msgid "Wednesday"
-msgstr "Onsdag"
+msgid "_End of day:"
+msgstr "Slutt trekk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Work Week"
-msgstr "&Arbeidsveke"
+msgid "_Fri"
+msgstr "Fre"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_General"
+msgstr "Generelt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Neste melding"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Mon"
+msgstr "Mån"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Other"
+msgstr "Anna"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Sat"
+msgstr "Lau"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Task List"
+msgstr "Oppgåver"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Wed"
+msgstr "Ons"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2808,82 +3941,77 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 #, fuzzy
 msgid " to "
 msgstr " til:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppgåver"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1477
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1482
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 #, fuzzy
 msgid "Unable to obtain current version!"
 msgstr "Kan ikkje setja opp utskriftstenaren."
@@ -2933,43 +4061,37 @@ msgstr "Er du sikker på at du vil sletta denne klassen?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "Vel ei biletefil"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Utval:"
+msgid "Addressbook..."
+msgstr "Adressebok"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Time Zones"
-msgstr "Tidssone"
+msgid "Delegate To:"
+msgstr "Delegert"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
-msgstr ""
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "Slett"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 #, fuzzy
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 #, fuzzy
 msgid "Reminder"
 msgstr "Påminning:"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "Møte"
 
@@ -2983,7 +4105,7 @@ msgid "B_usy"
 msgstr "Oppteke"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 #, fuzzy
 msgid "Classification"
@@ -2995,7 +4117,7 @@ msgid "Con_fidential"
 msgstr "Eksponentiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Date & Time"
 msgstr "Dato"
@@ -3006,13 +4128,13 @@ msgid "F_ree"
 msgstr "Gresk"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:6
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Praksis"
@@ -3024,7 +4146,7 @@ msgid "Show Time As"
 msgstr "Vis brukarar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Samandrag:"
@@ -3039,136 +4161,136 @@ msgstr "Slutt-tid:"
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Gruppenamn:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Kjelder"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "Vel ikon"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 msgid "Declined"
 msgstr "Slett"
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Slett"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "Framgong:"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Sende byte"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "F&jern rad ..."
@@ -3211,21 +4333,20 @@ msgid "Role"
 msgstr "Mobil:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 e-util/e-categories-config.c:94
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Status"
 msgstr "Status:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:82
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
 msgstr "Type:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
@@ -3275,7 +4396,7 @@ msgstr "Månad"
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3285,42 +4406,43 @@ msgstr "gong(ar)"
 msgid "A_dd"
 msgstr "Legg til"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Custom recurrence"
-msgstr "Tilpassa repetering"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Kvar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-#, fuzzy
-msgid "No recurrence"
-msgstr "Repetering"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 #, fuzzy
 msgid "Preview"
 msgstr "Førehandsvising:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "Regel for repetering"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "Tilpassa repetering"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
-msgid "Simple recurrence"
+msgid "_Modify"
+msgstr "Endre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
 msgstr "Repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
 #, fuzzy
-msgid "_Modify"
-msgstr "Endre"
+msgid "_Simple recurrence"
+msgstr "Repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 #, fuzzy
@@ -3368,70 +4490,64 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy
-msgid "Date Completed:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
-msgid "Delegated From:"
-msgstr "Delegert"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #, fuzzy
-msgid "Delegated To:"
-msgstr "Delegert"
+msgid "Date Completed:"
+msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
-msgid "No one"
-msgstr "Ingen"
+msgid "Progress"
+msgstr "Framgong:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Oppgåve"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioritet:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% Comp_lete:"
-msgstr "Ferdig"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Status:"
+msgstr "Status:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
-msgid "Progress"
-msgstr "Framgong:"
+msgid "Assignment"
+msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Skildring:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Start-dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:19
+#: calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
 msgid "_Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "_Due Date:"
 msgstr "Forfallsdato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-#, fuzzy
-msgid "_Priority:"
-msgstr "Prioritet:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-#, fuzzy
-msgid "_Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
@@ -3487,64 +4603,61 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3363
-#: calendar/gui/e-week-view.c:3206 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 #, fuzzy
 msgid "_Open"
 msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3372
-#: calendar/gui/e-week-view.c:3215 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3374
-#: calendar/gui/e-week-view.c:3217 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3349
-#: calendar/gui/e-day-view.c:3376 calendar/gui/e-week-view.c:3193
-#: calendar/gui/e-week-view.c:3219 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppgåva"
 
-#: calendar/gui/e-calendar-table.c:1129
+#: calendar/gui/e-calendar-table.c:1130
 #, fuzzy
-msgid "Click here to add a task"
+msgid "Click to add a task"
 msgstr "Trykk her for å leggja til ein ny virtuell vert."
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "Ferdig"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
 msgid "Alarms"
@@ -3589,7 +4702,11 @@ msgstr "Prioritet"
 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:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Samandrag"
 
@@ -3610,175 +4727,262 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1339
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1366
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:581 calendar/gui/e-week-view.c:314
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3342
-#, fuzzy
-msgid "New _Appointment"
-msgstr "&Vis avtale ..."
-
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3354 calendar/gui/e-week-view.c:3198
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Gå til &i dag"
 
-#: calendar/gui/e-day-view.c:3356 calendar/gui/e-week-view.c:3200
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "&Gå til side ..."
 
-#: calendar/gui/e-day-view.c:3365 calendar/gui/e-week-view.c:3208
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3384 calendar/gui/e-week-view.c:3233
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3386 calendar/gui/e-week-view.c:3235
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Erstatt denne førekomsten?"
 
-#: calendar/gui/e-day-view.c:3388 calendar/gui/e-week-view.c:3237
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:694
-#, fuzzy
-msgid "This is an event that can be added to your calendar."
-msgstr "Dette er ei topptekstramme - ho kan ikkje slettast."
+#: calendar/gui/e-itip-control.c:617
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "Dette er ei repeterande hending."
+msgid "Meeting Information"
+msgstr "Personleg informasjon"
 
-#: calendar/gui/e-itip-control.c:700
-#, fuzzy
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
-"Dette er første nivå\n"
-"i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:623
 #, fuzzy
-msgid "This is a request for the latest event information."
-msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
+msgid "Meeting Proposal"
+msgstr "Møte"
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:628
 #, fuzzy
-msgid "This is a reply to a meeting request."
+msgid "Meeting Update"
+msgstr "Møte"
+
+#: calendar/gui/e-itip-control.c:632
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "generer avlusingsinformasjon"
+
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
-msgid "This is an event cancellation."
+msgid "Meeting Reply"
+msgstr "Møte"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
-"Dette er det siste nivået\n"
-"i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:643
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "Meldinga har ingen sendar"
+msgid "Meeting Cancellation"
+msgstr "Vel ikon"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
-msgid "This is a task request."
-msgstr "Dette er ei repeterande hending."
+msgid "Bad Meeting Message"
+msgstr "&Finn i melding ..."
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
-msgid "This is a request for the latest task information."
+msgid "Task Update"
+msgstr "Slutt etter"
+
+#: calendar/gui/e-itip-control.c:680
+#, 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:746
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
 #, fuzzy
-msgid "This is a reply to a task request."
+msgid "Task Reply"
+msgstr "Svar"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
-"Dette er ein katalog og inga fil:\n"
-"%s"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "This is an task cancellation."
+msgid "Task Cancellation"
 msgstr "Dette er inga lokal fil.\n"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
-msgid "This is freebusy information."
+msgid "Bad Task Message"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:714
 #, fuzzy
-msgid "This is a request for freebusy information."
+msgid "Free/Busy Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:718
+#, 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:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:723
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr "Dette er ei repeterande hending."
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:729
 #, fuzzy
-msgid "The message contains only unsupported requests."
-msgstr "Meldinga har ingen sendar"
-
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
-msgstr ""
+msgid "Bad Free/Busy Message"
+msgstr "Private meldingar"
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:940
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Ferdig"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "Ferdig"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Dato"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -3832,21 +5036,12 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
-#, fuzzy
-msgid "%d %B"
-msgstr "%1 %2"
-
-#: calendar/gui/e-week-view.c:3186 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1260
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -3854,7 +5049,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1271
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
@@ -3886,50 +5081,50 @@ msgstr "Gå til side"
 
 #: calendar/gui/goto-dialog.glade.h:6
 #, fuzzy
+msgid "Go To Today"
+msgstr "Gå til &i dag"
+
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "May"
 msgstr "Måndag"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go to Today"
-msgstr "Gå til &i dag"
-
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -4092,12 +5287,6 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1024
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Oppgåver"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -4134,9 +5323,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1846 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:10
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Førehandsvising ..."
@@ -4276,7 +5464,11 @@ msgid ""
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:978
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -4390,7 +5582,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-search.c:495 camel/camel-filter-search.c:502
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -4419,12 +5611,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -4620,7 +5812,7 @@ msgid "Connection cancelled"
 msgstr "Avbroten."
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4752,42 +5944,69 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr "Inga autentisering i det heile"
 
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+msgid "Password"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Kjelder"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Lagar"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -4800,12 +6019,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4853,7 +6072,7 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to verify certificates."
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4861,7 +6080,7 @@ msgid ""
 msgstr "Emne"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4952,23 +6171,23 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4979,7 +6198,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Berre sjekk for ny e-post."
@@ -4989,7 +6208,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:651
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Mapper"
 
@@ -5029,7 +6248,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
@@ -5040,7 +6259,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -5052,12 +6271,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
+#: camel/providers/imap/camel-imap-store.c:837
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1023
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -5319,14 +6538,17 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
-msgid "Summarising folder"
+msgid "Summarizing folder"
 msgstr "Synkroniser"
 
 #: camel/providers/local/camel-mbox-summary.c:254
 #: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -5335,26 +6557,26 @@ msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot summarize 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:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1538
+#: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronising folder"
+msgid "Synchronizing folder"
 msgstr "Synkroniser"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -5463,6 +6685,17 @@ msgstr "Denne mappa kan ikkje fjernast."
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5555,36 +6788,36 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:193
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, 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:238
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:331
+#: 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:347
+#: 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:370
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slå saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar frå %1"
@@ -5604,7 +6837,7 @@ msgstr "&La e-posten liggja på tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:50
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr ""
 
@@ -5684,7 +6917,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -5738,7 +6971,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr ""
 
@@ -5746,127 +6979,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 #, fuzzy
 msgid "Service ready"
 msgstr "Skjul"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, 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:440
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5874,129 +7107,129 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:594
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Møte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, 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:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:988
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -6027,7 +7260,7 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
@@ -6066,7 +7299,7 @@ msgstr "MIME-type"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -6074,14 +7307,14 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Svar"
@@ -6089,34 +7322,34 @@ msgstr "Svar"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -6128,7 +7361,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:669
+#: composer/e-msg-composer.c:670
 #, fuzzy, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -6138,7 +7371,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: composer/e-msg-composer.c:682
+#: composer/e-msg-composer.c:683
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6147,67 +7380,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:881
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:878
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:900
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:925
+#: composer/e-msg-composer.c:919
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1046
+#: 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:1054
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1060
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1066
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1075
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6216,13 +7449,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -6232,25 +7465,25 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2270
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2364
+#: composer/e-msg-composer.c:2406
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -6298,161 +7531,88 @@ msgstr "Emne"
 
 #: default_user/searches.xml.h:4
 #, fuzzy
-msgid "Recipients contain"
-msgstr "Skildringar"
+msgid "Message contains"
+msgstr "Spørjinga inneheld"
 
 #: default_user/searches.xml.h:5
 #, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
+msgid "Recipients contain"
+msgstr "Skildringar"
 
 #: default_user/searches.xml.h:6
 #, fuzzy
-msgid "Subject does not contain"
-msgstr "Emne"
-
-#: e-util/e-categories-config.c:64
-#, fuzzy
-msgid "Birthday"
-msgstr "Fødselsdag:"
-
-#: e-util/e-categories-config.c:68
-#, fuzzy
-msgid "Competition"
-msgstr "Fullføring"
-
-#: e-util/e-categories-config.c:70
-#, fuzzy
-msgid "Favorites"
-msgstr "Kategoriar"
-
-#: e-util/e-categories-config.c:72
-msgid "Gifts"
-msgstr ""
-
-#: e-util/e-categories-config.c:74
-msgid "Goals/Objectives"
-msgstr ""
-
-#: e-util/e-categories-config.c:76
-#, fuzzy
-msgid "Holiday"
-msgstr "i dag"
-
-#: e-util/e-categories-config.c:78
-msgid "Holiday Cards"
-msgstr ""
-
-#: e-util/e-categories-config.c:80
-#, fuzzy
-msgid "Hot Contacts"
-msgstr "&Innhald ..."
-
-#: e-util/e-categories-config.c:82
-#, fuzzy
-msgid "Ideas"
-msgstr " dag"
-
-#: e-util/e-categories-config.c:84
-#, fuzzy
-msgid "International"
-msgstr "Informasjon"
-
-#: e-util/e-categories-config.c:86
-#, fuzzy
-msgid "Key Customer"
-msgstr "Tilpass ..."
-
-#: e-util/e-categories-config.c:88
-msgid "Miscellaneous"
-msgstr ""
-
-#: e-util/e-categories-config.c:90
-msgid "Personal"
-msgstr ""
-
-#: e-util/e-categories-config.c:92
-#, fuzzy
-msgid "Phone Calls"
-msgstr "Telefonliste:"
-
-#: e-util/e-categories-config.c:96
-#, fuzzy
-msgid "Strategies"
-msgstr "Kategoriar"
-
-#: e-util/e-categories-config.c:98
-#, fuzzy
-msgid "Suppliers"
-msgstr "Rediger fil"
+msgid "Sender contains"
+msgstr "Spørjinga inneheld"
 
-#: e-util/e-categories-config.c:100
+#: default_user/searches.xml.h:7
 #, fuzzy
-msgid "Time & Expenses"
-msgstr "Tidssone"
-
-#: e-util/e-categories-config.c:102
-msgid "VIP"
-msgstr ""
+msgid "Subject contains"
+msgstr "Emne"
 
-#: e-util/e-categories-config.c:104
+#: default_user/searches.xml.h:8
 #, fuzzy
-msgid "Waiting"
-msgstr "Avsluttar ..."
+msgid "Subject does not contain"
+msgstr "Emne"
 
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:239
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%H:%M"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
-#: widgets/misc/e-dateedit.c:1512
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 msgid "%Y/%m/%d"
 msgstr ""
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "Tx"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -6460,13 +7620,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:303
+#: e-util/e-time-utils.c:313
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:322
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%H:%M"
@@ -6569,7 +7729,7 @@ msgstr "Vis hendingane for denne dagen"
 msgid "Compare against"
 msgstr "Kompilatoråtvaringar"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 #, fuzzy
 msgid "now"
 msgstr "nei"
@@ -6584,12 +7744,17 @@ msgstr "Tag"
 msgid "ago"
 msgstr "Tag"
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%H:%M"
+
+#: filter/filter-datespec.c:722
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Trykk for å velja ein skrifttype"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filter-reglar"
@@ -6611,22 +7776,22 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:790
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 #, fuzzy
 msgid "<click here to select a folder>"
 msgstr "Trykk for å velja ein skrifttype"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6639,79 +7804,69 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:633
+#: filter/filter-rule.c:626
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:637
+#: filter/filter-rule.c:630
 #, fuzzy
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:647
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:672
+#: filter/filter-rule.c:665
 #, fuzzy
 msgid "Execute actions"
 msgstr "Køyr autorun.sh"
 
-#: filter/filter-rule.c:676
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:681
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:692
+#: filter/filter-rule.c:685
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "incoming"
 msgstr "Koding"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 #, fuzzy
 msgid "outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:1 my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
-msgid "Add"
-msgstr "Legg til"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Rediger"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:1
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Rediger fil"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Rediger filterreglar"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 #, fuzzy
 msgid "Outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "Mapper"
@@ -6738,222 +7893,223 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "Mange fargar"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "contains"
-msgstr "Handlingar"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Date received"
 msgstr "Motta"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Date sent"
 msgstr "Dato"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Deleted"
 msgstr "Slett"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-#, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
-
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "Fila finst ikkje\n"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "Avslutt"
 
-#: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "exists"
-msgstr "Neste"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Expression"
 msgstr "&Yrke:"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 #, fuzzy
 msgid "Mailing list"
 msgstr "E-post&liste for språket:"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 #, fuzzy
 msgid "Message Body"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Message was received"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Message was sent"
 msgstr "Lag meldingar og slå saman"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Read"
 msgstr "Tilfeldig"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Recipients"
 msgstr "Nyleg brukte fargar"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Replied to"
 msgstr "Svar til alle:"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 #, fuzzy
 msgid "Sender"
 msgstr "Send"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "Set Status"
 msgstr "Status:"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Storleik (KB)"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
+#: filter/libfilter-i18n.h:36
+#, fuzzy
+msgid "contains"
+msgstr "Handlingar"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "does not exist"
+msgstr "Fila finst ikkje\n"
+
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "does not sound like"
+msgstr "Fann ikkje fil"
+
+#: filter/libfilter-i18n.h:41
+#, fuzzy
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+#, fuzzy
+msgid "exists"
+msgstr "Neste"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "on or after"
+msgstr "Slutt etter"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr ""
+
 #: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "was after"
@@ -6987,14 +8143,13 @@ msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:814 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
 msgstr "Send"
@@ -7020,11 +8175,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7085,40 +8240,55 @@ msgstr "Øydelagd oppsettfil."
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Fil alt i liste"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet på spelarane"
 
 #: mail/component-factory.c:757
 #, fuzzy
+msgid "New Mail Message"
+msgstr "Legg til melding"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Legg til melding"
+
+#: mail/component-factory.c:789
+#, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:261
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -7126,156 +8296,160 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:909
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "Vel mappe"
+msgid "Create vFolder from Search"
+msgstr "Mapper"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1254
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1257
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1260
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1263
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1269
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1272
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1275
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1278
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "Resend"
-msgstr "Svar"
+msgid "_Edit as New Message..."
+msgstr "Private meldingar"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til:"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1304
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1320
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1496
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1497
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1489
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1500
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Fil alt i liste"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Personleg informasjon"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -7341,17 +8515,17 @@ msgid "Evolution News Editor"
 msgstr "KDeelop-installering"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
-#: mail/mail-account-gui.c:980
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "Vis sig&natur"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -7361,42 +8535,47 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 #, fuzzy
 msgid " (default)"
 msgstr "Standard"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "på"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 #, 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:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "Slett"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 #, 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:758
-msgid "Evolution Account Manager"
-msgstr ""
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "Skriftinnstillingar"
 
 #: mail/mail-autofilter.c:70
 #, fuzzy, c-format
@@ -7423,7 +8602,7 @@ msgstr "E-post&liste for språket:"
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -7431,30 +8610,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:218
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -7462,139 +8641,173 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:338
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
 #: mail/mail-callbacks.c:632
-#, fuzzy, c-format
-msgid "On %s, %s wrote:"
-msgstr "%D, skreiv %F:"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1353
+#: mail/mail-callbacks.c:1366
 #, 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:1375
+#: mail/mail-callbacks.c:1388
 #, 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:1409
+#: mail/mail-callbacks.c:1422
 #, 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:1421
+#: mail/mail-callbacks.c:1434
 #, 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:1442
+#: mail/mail-callbacks.c:1455
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Ingen rektangel valt!"
 
-#: mail/mail-callbacks.c:1526
+#: mail/mail-callbacks.c:1540
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1528
+#: mail/mail-callbacks.c:1542
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1751
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Flyttar"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "Ikkje spør igjen"
+
+#: mail/mail-callbacks.c:1826
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:1761
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1807
+#: mail/mail-callbacks.c:1882
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1853
+#: mail/mail-callbacks.c:1928
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-callbacks.c:1937
+#: mail/mail-callbacks.c:2012
 #, 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?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
 msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:141
 msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "KDeelop-installering"
+
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Innboks"
 
-#: mail/mail-config.c:1564
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1635 mail/mail-config.c:1638
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -7635,31 +8848,35 @@ msgstr ""
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Certificate ID:"
 msgstr "Dine SSL-sertifikat"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Ny melding"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7669,388 +8886,399 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "Fjern ramme"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "Default character encoding: "
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Detaljar ..."
 
 #: mail/mail-config.glade.h:26
 #, fuzzy
+msgid "Display"
+msgstr "Vis"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
 msgid "Done"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Kladd"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "E_nable"
 msgstr "på"
 
-#: mail/mail-config.glade.h:30 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Sender ei melding til ein nettverksspelar"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Endra ..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "på"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "&IMAP 4"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Inline"
 msgstr "Vinkel"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Kerberos "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "News"
 msgstr "Ny ..."
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Optional Information"
 msgstr "Personleg informasjon"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "E-post 2"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for oppkopling på nytt"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Secure MIME"
 msgstr "Er sikker"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:70 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Type: "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Special Folders"
 msgstr "Mapper"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardfil"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Check for supported types"
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "_Email Address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Empty trash folders on exit"
 msgstr "Tøm papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Merkingsvilkår"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Host:"
 msgstr "time/timar"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Lag meldingar og slå saman"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Name:"
 msgstr "Navn:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_Path:"
 msgstr "Sti:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "_Send mail in HTML format by default."
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "_Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "newswindow1"
 msgstr "Nytt vindauge"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "placeholder"
 msgstr "Bruk &plasshaldarar"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
@@ -8100,84 +9328,90 @@ 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:221
+#: mail/mail-display.c:222
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Lagrar fil ..."
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Lagra bilete som"
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:153
+#: mail/mail-folder-cache.c:154
 #, fuzzy, c-format
 msgid "%d hidden"
 msgstr "gøymt"
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Slett"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "(%1 totalt)"
@@ -8275,17 +9509,22 @@ msgstr ""
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:459
+#: mail/mail-local.c:330
 #, fuzzy, c-format
-msgid "Opening '%s'"
+msgid "No such folder /%s"
+msgstr "Vidaresendt melding"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "Opnar URL ..."
 
-#: mail/mail-local.c:749
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:870
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -8326,6 +9565,11 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
 #: mail/mail-mt.c:796
 #, fuzzy
 msgid "Working"
@@ -8341,113 +9585,123 @@ msgstr "Les mapper"
 msgid "Fetching Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:591
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:710
+#: mail/mail-ops.c:709
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:728
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:731 mail/mail-send-recv.c:506
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 #, fuzzy
 msgid "Complete."
 msgstr "Ferdig"
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:823
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:916
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1034
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1068 mail/mail-ops.c:1069
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 #, fuzzy
 msgid "Trash"
 msgstr "Oppgåve"
 
-#: mail/mail-ops.c:1203
+#: mail/mail-ops.c:1211
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-ops.c:1245 mail/mail-ops.c:1390
+#: mail/mail-ops.c:1253
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1322
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Lagar ei ny mappe"
+
+#: mail/mail-ops.c:1465
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synkroniser"
+
+#: mail/mail-ops.c:1603
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1626
+#: mail/mail-ops.c:1639
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1688
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1909
+#: mail/mail-ops.c:1921
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1947
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -8456,62 +9710,67 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:2009
+#: mail/mail-ops.c:2021
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-ops.c:2025
+#: 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:2054
+#: mail/mail-ops.c:2068
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-ops.c:2123
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå ..."
 
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Søk"
+
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "Legg til melding"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 #, fuzzy
 msgid "Find in Message"
 msgstr "&Finn i melding ..."
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Skil mellom store og små bokstavar"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 #, fuzzy
 msgid "Search Forward"
 msgstr "30 sekund framover"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 #, fuzzy
 msgid "Matches:"
 msgstr "Treff:"
@@ -8521,22 +9780,22 @@ msgstr "Treff:"
 msgid "Cancelling..."
 msgstr "Avbroten."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Send"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:311
 #, fuzzy
 msgid "Updating..."
 msgstr "Oppdater ..."
 
-#: mail/mail-send-recv.c:308 mail/mail-send-recv.c:359
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 #, fuzzy
 msgid "Waiting..."
 msgstr "Avsluttar ..."
 
-#: mail/mail-send-recv.c:502
+#: mail/mail-send-recv.c:494
 #, fuzzy
 msgid "Cancelled."
 msgstr "Avbroten."
@@ -8566,17 +9825,17 @@ msgstr "Vidaresendt melding frå %1"
 msgid "Forwarded message"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
@@ -8591,87 +9850,77 @@ msgstr "Fwd: (ingen emne)"
 msgid "%s - Message"
 msgstr "Legg til melding"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:636
 #, fuzzy
 msgid "Unseen"
 msgstr "partalssider"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:637
 #, fuzzy
 msgid "Seen"
 msgstr "Send"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:630
+#: mail/message-list.c:639
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:640
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Lagra melding"
 
-#: mail/message-list.c:635
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Lowest"
 msgstr "Senk"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Higher"
 msgstr "Høgd"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:650
 #, fuzzy
 msgid "Highest"
 msgstr "1 (høgast)"
 
-#: mail/message-list.c:891
+#: mail/message-list.c:900
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:898
+#: mail/message-list.c:907
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:928
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%H:%M"
 
-#: mail/message-list.c:927
-#, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%H:%M"
-
-#: mail/message-list.c:929
+#: mail/message-list.c:938
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/message-list.c:2299
+#: mail/message-list.c:2312
 #, fuzzy
 msgid "Generating message list"
 msgstr "Melding"
 
-#: mail/message-list.c:2311
-#, fuzzy
-msgid "Updating message list"
-msgstr "Melding"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
@@ -8685,40 +9934,79 @@ msgstr "Motta"
 msgid "Size"
 msgstr "Storleik"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:174
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar frå %1"
 
-#: mail/subscribe-dialog.c:1190 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "Mapper"
 
-#: mail/subscribe-dialog.c:1410
+#: mail/subscribe-dialog.c:1490
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Inga hending valt."
 
-#: mail/subscribe-dialog.c:1467
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr ""
 
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "Frisk opp lerret"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Alle kantar"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Visingsval:"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Skildring:"
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Kjelder"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Kjelder"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -8729,7 +10017,11 @@ msgstr "Kan ikkje initialisera lokale variablar"
 msgid "Factory for the Evolution executive summary component."
 msgstr "Øydelagd oppsettfil."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikkje initialisera lokale variablar"
@@ -8754,34 +10046,47 @@ msgstr "%H:%M"
 msgid "%a %l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppføring"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi namnet på gruppa du vil leggja til."
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "Navn:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "Skriftinnstillingar"
+msgid "Summary Settings"
+msgstr "Spørjinga inneheld"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8794,6 +10099,11 @@ msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "Diskusjonsgruppetenarar"
+
 #: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
@@ -8804,28 +10114,33 @@ msgstr "Ingen oppgåver ..."
 msgid "My Weather"
 msgstr "Vatn"
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Vatn"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "Start om att"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
 msgstr "%1 bit %2 %3"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "Evolution"
+msgid "Print Summary"
+msgstr "Samandrag"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "Feil ved skriving av band-ID."
 
 #: my-evolution/main.c:52
@@ -10188,136 +11503,146 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Legg til nytt bilete"
+msgid " _Remove"
+msgstr "Fjern"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "Alle kantar"
+msgid "Add n_ew feed"
+msgstr "Legg til nytt bilete"
 
 #: my-evolution/my-evolution.glade.h:3
 #, fuzzy
-msgid "All news feeds:"
-msgstr "&Alle felt"
-
-#: my-evolution/my-evolution.glade.h:4
-#, fuzzy
-msgid "All stations:"
+msgid "Al_l stations:"
 msgstr "&Tilgjengelege handlingar:"
 
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:1023
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "Calendar"
-msgstr "Skriv ut alle"
+msgid "All _folders:"
+msgstr "Alle kantar"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "Skjermkontrollerarar"
+msgid "All news _feeds:"
+msgstr "&Alle felt"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "Visingsval:"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
 #, fuzzy
-msgid "Displayed feeds:"
-msgstr "Vist namn:"
+msgid "Ma_x number of items shown:"
+msgstr "&Høgste tal på hopp:"
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr " dagar"
+msgid "News Feed Settings"
+msgstr "Nettverksinnstillingar"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "Neste månad"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Veke"
 
 #: my-evolution/my-evolution.glade.h:12
 #, fuzzy
-msgid "Max number of items shown:"
-msgstr "&Høgste tal på hopp:"
+msgid "Refresh _time (seconds):"
+msgstr "&Oppfriskingsrate:"
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "Nettverksinnstillingar"
+msgid "Show _all tasks"
+msgstr "Vedlegg"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
-msgid "News Feeds"
-msgstr "Diskusjonsgruppetenarar"
+msgid "Show _today's tasks"
+msgstr "Vedlegg"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr " dag"
+msgid "Tasks "
+msgstr "Oppgåver"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "Neste månad"
+msgid "Units: "
+msgstr "Einingar"
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "One week"
-msgstr "Veke"
-
-#: my-evolution/my-evolution.glade.h:18
-#, fuzzy
-msgid "Refresh time (seconds):"
-msgstr "&Oppfriskingsrate:"
+msgid "Weather settings"
+msgstr "Toppinnstillingar"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr "&Plan"
+msgid "_Display folders:"
+msgstr "Skjermkontrollerarar"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "Vedlegg"
+msgid "_Display stations:"
+msgstr "Visingsval:"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "Vis sidekantar"
+msgid "_Displayed feeds:"
+msgstr "Vist namn:"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Vedlegg"
+msgid "_Five days"
+msgstr " dagar"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Oppgåver"
+msgid "_Mail"
+msgstr "Send"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr "Einingar"
+msgid "_News Feeds"
+msgstr "Diskusjonsgruppetenarar"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Vatn"
+msgid "_One day"
+msgstr " dag"
 
 #: my-evolution/my-evolution.glade.h:26
 #, fuzzy
-msgid "Weather settings"
-msgstr "Toppinnstillingar"
+msgid "_Refresh time (seconds):"
+msgstr "&Oppfriskingsrate:"
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "seriell"
+msgid "_Schedule"
+msgstr "&Plan"
 
 #: my-evolution/my-evolution.glade.h:28
 #, fuzzy
-msgid "metric"
+msgid "_Show full path for folders"
+msgstr "Vis sidekantar"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Vatn"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "seriell"
+
+#: my-evolution/my-evolution.glade.h:31
+#, fuzzy
+msgid "m_etric"
 msgstr "Geometrisk"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -10335,7 +11660,15 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "&Avbryt operasjon"
 
-#: shell/e-local-storage.c:551
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "Mapper"
@@ -10388,7 +11721,7 @@ msgid ""
 "`%s'."
 msgstr "Ein feil oppstod ved lagring."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -10396,7 +11729,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -10405,7 +11738,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -10428,50 +11761,57 @@ msgstr "kan ikkje opna fila %1"
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-shell-folder-commands.c:284
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:290
 #, fuzzy
 msgid "Copy folder"
 msgstr "Kopier til mappe"
 
-#: shell/e-shell-folder-commands.c:327
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:333
 #, fuzzy
 msgid "Move folder"
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "Vel filter"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:377
+#: shell/e-shell-folder-commands.c:384
 #, 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?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:450
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-commands.c:454 shell/e-shortcuts-view.c:412
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Omdøyp"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:462
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -10502,11 +11842,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
@@ -10537,7 +11877,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -10587,7 +11927,7 @@ msgstr "Automatisk"
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 #, fuzzy
 msgid "Select a file"
 msgstr "Signaturfil:"
@@ -10597,11 +11937,11 @@ msgstr "Signaturfil:"
 msgid "File type:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
@@ -10610,324 +11950,335 @@ msgstr ""
 msgid "Closing connections..."
 msgstr "Lukkar prosjekt ..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Kan ikkje initialisera adresseboka"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:702
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "Flyttar"
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Work Offline"
 msgstr "Flyttar"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1380
+#: shell/e-shell-view.c:1459
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1382
+#: shell/e-shell-view.c:1461
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1420
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1427
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1433
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:489
+#: shell/e-shell.c:509
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1393
+#: shell/e-shell.c:1438
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1579 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: shell/e-shell.c:1581
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1583
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1585
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1587 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-shortcuts-view.c:101
+#: shell/e-shortcuts-view.c:72
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Endra snarveg for:"
 
-#: shell/e-shortcuts-view.c:102
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
-#: shell/e-shortcuts-view.c:200
+#: shell/e-shortcuts-view.c:171
 #, fuzzy, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:176
 #, fuzzy
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:218
 #, fuzzy
 msgid "_Small Icons"
 msgstr "Små ikon"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:221
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:233
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:234
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:237
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:246
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsnøggtastar"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Endra portnamn"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:366
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "&Merka tekst"
 
-#: shell/e-shortcuts-view.c:407 ui/evolution-message-composer.xml.h:13
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: shell/e-shortcuts-view.c:407
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:409 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 #, fuzzy
 msgid "Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: shell/e-shortcuts-view.c:409
+#: shell/e-shortcuts-view.c:380
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:412
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne oppføringa"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:619
+#: shell/e-shortcuts.c:641
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-shortcuts.c:1018
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1022
-msgid "Inbox"
-msgstr "Innboks"
-
-#: shell/e-shortcuts.c:1025
-#, fuzzy
-msgid "Contacts"
-msgstr "&Innhald ..."
-
-#: shell/e-storage-set-view.c:1486
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip å senda."
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje støtta på tenar"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: shell/e-storage.c:513
+#, fuzzy
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
 #, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
@@ -10966,18 +12317,27 @@ msgstr ""
 
 #: shell/importer/import.glade.h:2
 #, fuzzy
-msgid "Evolution Import Utility"
+msgid "Evolution Import Assistant"
 msgstr "KDeelop-installering"
 
 #: shell/importer/import.glade.h:3
 #, fuzzy
-msgid "Evolution Importer Utility"
+msgid "Evolution Importer Assistant"
 msgstr "KDeelop-installering"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "Signaturfil:"
+
 #: shell/importer/import.glade.h:6
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
@@ -10998,7 +12358,7 @@ msgstr "Ikkje spør igjen"
 
 #: shell/importer/intelligent.c:209
 #, fuzzy
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr "Bruk på følgjande delar:"
 
 #: shell/main.c:95
@@ -11024,32 +12384,32 @@ msgid ""
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:154
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, fuzzy, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:221
+#: shell/main.c:228
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:222
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:261
+#: shell/main.c:271
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "Kopier"
 
@@ -11068,11 +12428,11 @@ msgstr "Lagar eit nytt dokument"
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Slettar den valte fila"
@@ -11082,58 +12442,48 @@ msgstr "Slettar den valte fila"
 msgid "Delete selected contacts"
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-addressbook.xml.h:10
-#, fuzzy
-msgid "New contact"
-msgstr "Se&nd avtale"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "Ny liste"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Slett kolonne"
 
-#: ui/evolution-addressbook.xml.h:22
-#, fuzzy
-msgid "Send _contact to other"
-msgstr "Send svar til ..."
-
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
 #, fuzzy
-msgid "Send _message to contact"
+msgid "Send _Message to Contact..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -11141,45 +12491,59 @@ msgstr "Sender ei melding til ein nettverksspelar"
 msgid "Send a mess to the selected contacts."
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Sender ei melding til ein nettverksspelar"
+
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Stop"
 msgstr "Poengsum"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "Stop Loading"
 msgstr "Lagring"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 #, fuzzy
 msgid "_Actions"
 msgstr "Handlingar"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Kjelde:"
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Contact"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "&Innhald ..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 #, fuzzy
 msgid "_Print..."
 msgstr "Skriv ut"
@@ -11190,16 +12554,19 @@ msgid "_Save as VCard"
 msgstr "Lagra som"
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
-msgstr ""
+#, fuzzy
+msgid "_Search for Contacts"
+msgstr "Slett kolonne"
 
 #: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution.xml.h:59
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 #, fuzzy
 msgid "_Tools"
 msgstr "Verktøy"
@@ -11210,131 +12577,138 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "Feil ved opning"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "&Slett avtale"
+msgid "Create a New _Task"
+msgstr "Lagar eit nytt dokument"
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "Dag"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "&Slett avtale"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Gå til side"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
-msgid "Go back in time"
+msgid "Go back"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
-msgid "Go forward in time"
+msgid "Go forward"
 msgstr "Fram"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Gå til side"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "Gå til side"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
-msgid "Go to present time"
-msgstr "Ikkje vis den overskytande teksten"
+msgid "Go to today"
+msgstr "Gå til &i dag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+msgid "Month"
+msgstr "Månad"
+
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "New Appointment"
 msgstr "&Vis avtale ..."
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+#, fuzzy
+msgid "New Task"
+msgstr "Oppgåve"
+
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 #, fuzzy
-msgid "Print calendar"
-msgstr "Skriv ut alle"
+msgid "Print Pre_view"
+msgstr "&Førehandsvising ..."
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Print this Calendar"
+msgid "Print this calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "Informasjon"
-
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
-msgid "Show 1 day"
+msgid "Show one day"
 msgstr "Vis dato"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "Show 1 month"
+msgid "Show one month"
 msgstr "Vis metodar"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
-msgid "Show 1 week"
+msgid "Show one week"
 msgstr "Vis %1"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:28
-#, fuzzy
-msgid "W_ork Week"
-msgstr "&Arbeidsveke"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Veke"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "Avtale"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-calendar.xml.h:32
-#, fuzzy
-msgid "_Day"
-msgstr "Dag"
-
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:41
 #, fuzzy
-msgid "_Month"
-msgstr "Månad"
+msgid "_Publish Free/Busy Information"
+msgstr "Informasjon"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 #, fuzzy
-msgid "_Week"
-msgstr "Veke"
+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
@@ -11347,16 +12721,16 @@ msgstr "Lukk"
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "Close this appointment"
-msgstr "&Slett avtale"
+msgid "Close this item"
+msgstr "Slett denne adressa"
 
-#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 #, fuzzy
-msgid "Delete this appointment"
-msgstr "&Slett avtale"
+msgid "Delete this item"
+msgstr "Slett denne adressa"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr ""
 
@@ -11365,128 +12739,91 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Sen melding"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Print Pre_view"
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-comp-editor.xml.h:11
-#, fuzzy
-msgid "Print S_etup"
-msgstr "Speloppsett"
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 #, fuzzy
 msgid "Print this item"
 msgstr "Skriv til fil"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 #, fuzzy
 msgid "Print..."
 msgstr "Skriv ut"
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Lagra"
+
+#: ui/evolution-comp-editor.xml.h:14
 #, fuzzy
 msgid "Save and Close"
 msgstr "Lagra ei fil"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, fuzzy
 msgid "Save this item to disk"
 msgstr "Lagra til disk"
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:19
-#, fuzzy
-msgid "_Action"
-msgstr "Handlingar"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: ui/evolution-contact-editor.xml.h:3
-#, fuzzy
-msgid "Delete this item"
-msgstr "Slett denne adressa"
-
-#: ui/evolution-contact-editor.xml.h:4
-#, fuzzy
-msgid "Help"
-msgstr "Heim"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Private meldingar"
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-#, fuzzy
-msgid "See online help"
-msgstr "Me er tilkopla!"
-
-#: ui/evolution-contact-editor.xml.h:13
-#, fuzzy
-msgid "Send _message to contact..."
-msgstr "Sender ei melding til ein nettverksspelar"
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "Lagra"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "Slett denne adressa"
 
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 #, fuzzy
 msgid "Delete..."
 msgstr "Slett"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "Send svar til ..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "Sender ei melding til ein nettverksspelar"
@@ -11496,22 +12833,22 @@ msgstr "Sender ei melding til ein nettverksspelar"
 msgid "Cancel Mee_ting"
 msgstr "Køyreplan ..."
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "Lagra val for denne verten."
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Fort framover"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 #, fuzzy
 msgid "Obtain the latest meeting information"
 msgstr "generer avlusingsinformasjon"
@@ -11526,7 +12863,7 @@ msgstr "Oppfriskingstid"
 msgid "Schedule _Meeting"
 msgstr "Køyreplan ..."
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Køyreplan ..."
@@ -11547,40 +12884,40 @@ msgstr "Snur om på merkinga"
 
 #: ui/evolution-mail-global.xml.h:3
 #, fuzzy
-msgid "Compose"
-msgstr "Lukk"
-
-#: ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Compose _New Message"
 msgstr "Lukk melding"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 #, fuzzy
 msgid "Empty _Trash"
 msgstr " dag"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "Legg til melding"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
@@ -11612,32 +12949,32 @@ msgstr ""
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Filters..."
 msgstr "E-post:"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Legg til melding"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Førehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Mottakar"
 
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:24
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Leitar etter tilleggsmodular"
@@ -11647,98 +12984,103 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "Change the properties of this folder"
 msgstr "Endra namnet på spelarane"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Klipp ut"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Neste melding"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Mar&ker som ulesen"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Mark all visible messages as read"
 msgstr "Lag meldingar og slå saman"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "Limer inn ..."
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Kontroller stavinga til alle dei omsette programtekstane i fila."
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 #, fuzzy
 msgid "Select _All"
 msgstr "Vel mappe"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Vel mappe"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Merk alle meldingane"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 #, fuzzy
-msgid "Show _All"
+msgid "Sh_ow Hidden Messages"
 msgstr "Vidaresendt melding frå %1"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Temporarily hide the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Vidaresendt melding frå %1"
@@ -11747,7 +13089,7 @@ msgstr "Vidaresendt melding frå %1"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:45
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Folder"
 msgstr "Mapper"
@@ -11757,12 +13099,12 @@ msgstr "Mapper"
 msgid "_Invert Selection"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties..."
 msgstr "Eigenskapar ..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Vidaresendt melding frå %1"
@@ -12024,7 +13366,7 @@ msgstr "Kopierer det merkte området til utklippstavla"
 
 #: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "Preview the message to be printed"
 msgstr "Sen melding"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -12046,45 +13388,39 @@ msgstr "Private meldingar"
 msgid "Previous Unread Message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:64
-#, fuzzy
-msgid "Print Message..."
-msgstr "Private meldingar"
-
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Print Preview..."
-msgstr "&Førehandsvising ..."
-
-#: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
 msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "S_earch Message"
 msgstr "Søk i &meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen på ruta her."
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
@@ -12135,50 +13471,45 @@ msgstr "Mappa finst: "
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Rediger fil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Message Display"
 msgstr "Endra tidsvising"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send melding"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
-msgid "_Re-send Message"
-msgstr "Send melding"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
@@ -12187,13 +13518,13 @@ msgstr "&Slett avtale"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Close"
 msgstr "Lukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:60
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
@@ -12268,11 +13599,6 @@ msgstr "&Krypter"
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Lagra"
-
 #: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
@@ -12420,7 +13746,7 @@ msgstr "Svar"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:48
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Help"
 msgstr "Heim"
@@ -12457,16 +13783,30 @@ msgstr ""
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "Mange fargar"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "Avbryt"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "Slettar oppgåve"
+msgid "Cancel this task"
+msgstr "Avbryt"
 
 #: ui/evolution-task-editor.xml.h:7
 #, fuzzy
+msgid "Obtain the latest task information"
+msgstr "generer avlusingsinformasjon"
+
+#: ui/evolution-task-editor.xml.h:8
+#, fuzzy
 msgid "Re_fresh Task"
 msgstr "Frisk opp lerret"
 
@@ -12474,46 +13814,32 @@ msgstr "Frisk opp lerret"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-tasks.xml.h:4
-#, fuzzy
-msgid "Create a new task"
-msgstr "Lagar eit nytt dokument"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Delete selected tasks"
 msgstr "Slett den valte oppgåva"
 
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "New Task"
-msgstr "Oppgåve"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgåve eller variabel frå utklippstavla."
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr ""
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Task"
 msgstr "Oppgåve"
@@ -12582,174 +13908,143 @@ msgid "Exit the program"
 msgstr ""
 
 #: ui/evolution.xml.h:16
-#, fuzzy
-msgid "Getting _Started"
-msgstr "Starta"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Bruk denne tekstboksen for å kommentera tittelen"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "&Opna i eige vindauge"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Opna filer i nytt vindauge"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Byt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "&Programsnøggtastar"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Using the C_ontact Manager"
-msgstr "Skriv ut alle"
-
-#: ui/evolution.xml.h:32
-#, fuzzy
-msgid "Using the _Calendar"
-msgstr "Skriv ut alle"
-
-#: ui/evolution.xml.h:33
-#, fuzzy
-msgid "Using the _Mailer"
-msgstr "Skriv ut alle"
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Oppløysing"
 
-#: ui/evolution.xml.h:38
-#, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "Avtale"
-
-#: ui/evolution.xml.h:40
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Comment=X-redigering"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
 msgstr "&Kopier ..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "Mapper"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Flytt til mappe"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Import file..."
+msgid "_Import File..."
 msgstr "Sett inn fil ..."
 
-#: ui/evolution.xml.h:50
-#, fuzzy
-msgid "_Index"
-msgstr "Set inn"
-
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Mail message"
-msgstr "Legg til melding"
-
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Move..."
 msgstr "&Flytt ..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_New"
 msgstr "Vis"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_New Folder"
 msgstr "Ny mappe"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Rename..."
 msgstr "Omdøyp ..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Snarveg"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:58
-#, fuzzy
-msgid "_Task (FIXME)"
-msgstr "Comment=X-redigering"
-
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Flyttar"
 
 #: ui/my-evolution.xml.h:1
 #, fuzzy
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr "Fargar og innstillingar for HTML-eksport"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "oppsummering"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Tilfeldig"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "Skriftinnstillingar"
 
 #: views/addressbook/galview.xml.h:1
@@ -12791,6 +14086,27 @@ msgstr "Meldingar"
 msgid "With Category"
 msgstr "Kategori"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Vel ei biletefil"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Utval:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "Tidssone"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -12883,7 +14199,7 @@ msgstr "Kontaktar"
 msgid "_Current View"
 msgstr "tid no"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 #, fuzzy
 msgid "Define Views"
 msgstr "Detaljert oversikt"
@@ -12894,17 +14210,23 @@ msgstr "Detaljert oversikt"
 msgid "MTWTFSS"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+#, fuzzy
+msgid "%B %Y"
+msgstr "%1 %2"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 #, fuzzy
 msgid "Today"
 msgstr "i dag"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ein bandindeks må vera valt i treet."
@@ -12993,17 +14315,27 @@ msgstr "Datakoding"
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "Comment=X-redigering"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 #, fuzzy
 msgid "Save Search"
 msgstr "Søk"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Søk"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Skriv ut alle"
+
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
@@ -13012,11 +14344,6 @@ msgstr ""
 msgid "Information"
 msgstr "Informasjon"
 
-#: widgets/misc/e-messagebox.c:159
-#, fuzzy
-msgid "Warning"
-msgstr "Flyttar"
-
 #: widgets/misc/e-messagebox.c:166
 #, fuzzy
 msgid "Error"
@@ -13038,15 +14365,15 @@ msgstr "Legg til melding"
 msgid "Don't show this message again."
 msgstr "Sen melding"
 
-#: widgets/misc/e-search-bar.c:180
+#: widgets/misc/e-search-bar.c:334
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Søk"
 
-#: widgets/misc/e-search-bar.c:272
+#: widgets/misc/e-search-bar.c:460
 #, fuzzy
-msgid "Activate"
-msgstr "Privat"
+msgid "Find Now"
+msgstr "Finn:"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
@@ -13075,6 +14402,338 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
 #, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Samandrag"
+
+#, fuzzy
+#~ msgid "LDAP Server"
+#~ msgstr "Tenar:"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Fil"
+
+#, fuzzy
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Kan ikkje opna adresseboka."
+
+#, fuzzy
+#~ msgid "Unknown auth type"
+#~ msgstr "Ukjend feil"
+
+#, fuzzy
+#~ msgid "Subtree"
+#~ msgstr "Kjelder"
+
+#, fuzzy
+#~ msgid "Host:"
+#~ msgstr "time/timar"
+
+#, fuzzy
+#~ msgid "Root DN:"
+#~ msgstr "Rot"
+
+#~ msgid "Authentication:"
+#~ msgstr "Autentisering:"
+
+#, fuzzy
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Avanserte kISDN-val"
+
+#~ msgid "Path:"
+#~ msgstr "Sti:"
+
+#, fuzzy
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Fila finst ikkje\n"
+
+#~ msgid "Name"
+#~ msgstr "Namn"
+
+#, fuzzy
+#~ msgid "URI"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "Spørjinga inneheld"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "Vel ei gruppe først."
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Avbroten."
+
+#, fuzzy
+#~ msgid "Unfiled"
+#~ msgstr "Utan tittel"
+
+#, fuzzy
+#~ msgid "Calendar Preferences"
+#~ msgstr "Innstillingar"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Delegert"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Ingen"
+
+#~ msgid "Task"
+#~ msgstr "Oppgåve"
+
+#, fuzzy
+#~ msgid "% Comp_lete:"
+#~ msgstr "Ferdig"
+
+#, fuzzy
+#~ msgid "This is an event that can be added to your calendar."
+#~ msgstr "Dette er ei topptekstramme - ho kan ikkje slettast."
+
+#, fuzzy
+#~ msgid "This is a meeting request."
+#~ msgstr "Dette er ei repeterande hending."
+
+#, fuzzy
+#~ msgid "This is one or more additions to a current meeting."
+#~ msgstr ""
+#~ "Dette er første nivå\n"
+#~ "i denne samlinga."
+
+#, fuzzy
+#~ msgid "This is a request for the latest event information."
+#~ msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
+
+#, fuzzy
+#~ msgid "This is an event cancellation."
+#~ msgstr ""
+#~ "Dette er det siste nivået\n"
+#~ "i denne samlinga."
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "Meldinga har ingen sendar"
+
+#, fuzzy
+#~ msgid "This is a task request."
+#~ msgstr "Dette er ei repeterande hending."
+
+#, fuzzy
+#~ msgid "This is a reply to a task request."
+#~ msgstr ""
+#~ "Dette er ein katalog og inga fil:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Meldinga har ingen sendar"
+
+#, fuzzy
+#~ msgid "Birthday"
+#~ msgstr "Fødselsdag:"
+
+#, fuzzy
+#~ msgid "Competition"
+#~ msgstr "Fullføring"
+
+#, fuzzy
+#~ msgid "Favorites"
+#~ msgstr "Kategoriar"
+
+#, fuzzy
+#~ msgid "Holiday"
+#~ msgstr "i dag"
+
+#, fuzzy
+#~ msgid "Hot Contacts"
+#~ msgstr "&Innhald ..."
+
+#, fuzzy
+#~ msgid "International"
+#~ msgstr "Informasjon"
+
+#, fuzzy
+#~ msgid "Key Customer"
+#~ msgstr "Tilpass ..."
+
+#, fuzzy
+#~ msgid "Phone Calls"
+#~ msgstr "Telefonliste:"
+
+#, fuzzy
+#~ msgid "Strategies"
+#~ msgstr "Kategoriar"
+
+#, fuzzy
+#~ msgid "Suppliers"
+#~ msgstr "Rediger fil"
+
+#, fuzzy
+#~ msgid "Time & Expenses"
+#~ msgstr "Tidssone"
+
+#, fuzzy
+#~ msgid "Waiting"
+#~ msgstr "Avsluttar ..."
+
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Edit"
+#~ msgstr "Rediger"
+
+#, fuzzy
+#~ msgid "Store search as vFolder"
+#~ msgstr "Vel mappe"
+
+#, fuzzy
+#~ msgid "Resend"
+#~ msgstr "Svar"
+
+#, fuzzy
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%D, skreiv %F:"
+
+#, fuzzy
+#~ msgid "Updating message list"
+#~ msgstr "Melding"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "Skriftinnstillingar"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Feil ved skriving av band-ID."
+
+#, fuzzy
+#~ msgid "My Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "New contact"
+#~ msgstr "Se&nd avtale"
+
+#, fuzzy
+#~ msgid "Send _contact to other"
+#~ msgstr "Send svar til ..."
+
+#, fuzzy
+#~ msgid "Send _message to contact"
+#~ msgstr "Sender ei melding til ein nettverksspelar"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "&Innhald ..."
+
+#, fuzzy
+#~ msgid "Go to present time"
+#~ msgstr "Ikkje vis den overskytande teksten"
+
+#, fuzzy
+#~ msgid "W_ork Week"
+#~ msgstr "&Arbeidsveke"
+
+#, fuzzy
+#~ msgid "_Day"
+#~ msgstr "Dag"
+
+#, fuzzy
+#~ msgid "_Month"
+#~ msgstr "Månad"
+
+#, fuzzy
+#~ msgid "_Week"
+#~ msgstr "Veke"
+
+#, fuzzy
+#~ msgid "Close this appointment"
+#~ msgstr "&Slett avtale"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "Speloppsett"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "Heim"
+
+#, fuzzy
+#~ msgid "See online help"
+#~ msgstr "Me er tilkopla!"
+
+#, fuzzy
+#~ msgid "Show _All"
+#~ msgstr "Vidaresendt melding frå %1"
+
+#, fuzzy
+#~ msgid "Print Preview..."
+#~ msgstr "&Førehandsvising ..."
+
+#, fuzzy
+#~ msgid "_Re-send Message"
+#~ msgstr "Send melding"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "Slettar oppgåve"
+
+#, fuzzy
+#~ msgid "Getting _Started"
+#~ msgstr "Starta"
+
+#, fuzzy
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "Using the _Calendar"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "Using the _Mailer"
+#~ msgstr "Skriv ut alle"
+
+#, fuzzy
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "Comment=X-redigering"
+
+#, fuzzy
+#~ msgid "_Index"
+#~ msgstr "Set inn"
+
+#, fuzzy
+#~ msgid "_Mail message"
+#~ msgstr "Legg til melding"
+
+#, fuzzy
+#~ msgid "_Task (FIXME)"
+#~ msgstr "Comment=X-redigering"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#, fuzzy
+#~ msgid "Activate"
+#~ msgstr "Privat"
+
+#, fuzzy
 #~ msgid "Transparent"
 #~ msgstr "Gjennomsiktig "
 
@@ -13106,26 +14765,14 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Gjennomsiktig "
 
 #, fuzzy
-#~ msgid "_Go To Today"
-#~ msgstr "Gå til &i dag"
-
-#, fuzzy
 #~ msgid "Receiving"
 #~ msgstr "Motta"
 
 #, fuzzy
-#~ msgid "Sending"
-#~ msgstr "Sender %1"
-
-#, fuzzy
 #~ msgid "Store"
 #~ msgstr "Poengsum"
 
 #, fuzzy
-#~ msgid "Manage Subscriptions"
-#~ msgstr "Skildring:"
-
-#, fuzzy
 #~ msgid "Manage _Subscriptions..."
 #~ msgstr "Skildring:"
 
@@ -13165,18 +14812,10 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgstr "Leitar etter tilleggsmodular"
 
 #, fuzzy
-#~ msgid "Sender contains"
-#~ msgstr "Spørjinga inneheld"
-
-#, fuzzy
 #~ msgid "Forward to Address"
 #~ msgstr "Vidaresendt melding"
 
 #, fuzzy
-#~ msgid "Creating new folder"
-#~ msgstr "Lagar ei ny mappe"
-
-#, fuzzy
 #~ msgid "Copying messages"
 #~ msgstr "Melding"
 
@@ -13234,12 +14873,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgid "Create a new calendar"
 #~ msgstr "Feil ved opning"
 
-#~ msgid "Day"
-#~ msgstr "Dag"
-
-#~ msgid "Month"
-#~ msgstr "Månad"
-
 #, fuzzy
 #~ msgid "New _Event"
 #~ msgstr "Ny &hending ..."
@@ -13256,9 +14889,6 @@ msgstr "Kunne ikkje initiere Bonobo"
 #~ msgid "Settings..."
 #~ msgstr "Skriftinnstillingar"
 
-#~ msgid "Week"
-#~ msgstr "Veke"
-
 #, fuzzy
 #~ msgid "_Open Calendar"
 #~ msgstr "Feil ved opning"