Sync for 0.13.

svn path=/trunk/; revision=12408
author: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-23 07:18:14 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-23 07:18:14 +0800
commit: df73d86dcb9f2a9b2177d6694c68c0ebe432b364 (patch)
tree: badb87b38dc4b74df00899b45d774054672cc19a /po/fi.po
parent: d9e5feffa70559cb7ff8201c1493e0a0f2ca9af9 (diff)
download: gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.gz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.bz2
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.lz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.xz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.zst
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.zip
1 files changed, 2956 insertions, 1371 deletions
diff --git a/po/fi.po b/po/fi.po
index 54fce23bd1..c81b69f473 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Jarkko Ranta <jjranta@cc.joensuu.fi> 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-08-11 23:25+0300\n"
+"POT-Creation-Date: 2001-08-22 18:50-0400\n"
 "PO-Revision-Date: 2001-05-08 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -21,11 +22,11 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3624
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "Kortti: "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +34,7 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +42,7 @@ msgstr ""
 "\n"
 "  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +50,7 @@ msgstr ""
 "\n"
 "  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +58,7 @@ msgstr ""
 "\n"
 "  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -65,13 +66,13 @@ msgstr ""
 "\n"
 "  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -79,7 +80,7 @@ msgstr ""
 "\n"
 "Syntymäpäivä: "
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -87,7 +88,7 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -95,13 +96,13 @@ msgstr ""
 "\n"
 "  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
@@ -109,7 +110,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
@@ -117,13 +118,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3662
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +132,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -139,13 +140,13 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3677
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3689
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +154,7 @@ msgstr ""
 "\n"
 "Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +162,7 @@ msgstr ""
 "\n"
 "Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +170,7 @@ msgstr ""
 "\n"
 "Sähköposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -177,13 +178,13 @@ msgstr ""
 "\n"
 "Sähköposti:"
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +192,7 @@ msgstr ""
 "\n"
 "Aikavyöhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,19 +200,19 @@ msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3769
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -219,7 +220,7 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3770
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -227,7 +228,7 @@ msgstr ""
 "\n"
 "  Yksikkö: "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -235,7 +236,7 @@ msgstr ""
 "\n"
 "  Yksikkö2: "
 
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -243,7 +244,7 @@ msgstr ""
 "\n"
 "  Yksikkö3: "
 
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -251,7 +252,7 @@ msgstr ""
 "\n"
 "  Yksikkö4: "
 
-#: addressbook/backend/ebook/e-card.c:3777
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -259,7 +260,7 @@ msgstr ""
 "\n"
 "Ryhmät: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -275,13 +276,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3791
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3794
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -289,11 +290,11 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:4066
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4074
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
 #: 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
@@ -318,20 +319,20 @@ msgstr "Kohdistimen lataaminen epäonnistui\n"
 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
 msgid "Could not start wombat server"
 msgstr ""
 
-#: 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
 msgid "Could not start wombat"
 msgstr ""
 
-#: 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 ""
 
@@ -379,6 +380,38 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
+#: 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
+msgid "Contacts"
+msgstr "Kontaktit"
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "_Kontaktiluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "_Kontaktiluettelo"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Muokkaa osoitekirjaa"
@@ -396,142 +429,148 @@ msgid "Add Addressbook"
 msgstr "Lisää osoitekirja"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "_Osoitekirjan lähteet..."
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Edistynyt"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "_Poista"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Palvelimen nimi"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "Allaolevat tiedot vaaditaan osoitekirjan lisäämiseksi.  "
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: 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.glade.h:16
+#: 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:17
+#: 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:18
+#: 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:19
+#: 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 ""
 "Tätä nimeä käytetään tilisi tunnistamiseksi. Se on vain sinua itseäsi varten"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "_Tilin nimi:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-#: 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:88
-#: my-evolution/my-evolution.glade.h:18
+#: 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
 msgid "_Add"
 msgstr "_Lisää"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-#: mail/mail-config.glade.h:93 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:40
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "Palveli_meni vaati todennuksen"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/addressbook-storage.c:135
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:372
+#: addressbook/gui/component/addressbook.c:386
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:394
 msgid "LDAP Authentication"
 msgstr "LDAP-Todennus"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:405
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/addressbook.c:404
+#: addressbook/gui/component/addressbook.c:418
 msgid "Password:"
 msgstr "Salasana:"
 
-#: addressbook/gui/component/addressbook.c:467
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:474
+#: 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:479
+#: 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"
@@ -539,54 +578,73 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:638
-#: 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 "Mikä tahansa kenttä sisältää"
 
-#: addressbook/gui/component/addressbook.c:639
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
-#: addressbook/gui/component/addressbook.c:640
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "Sähköposti sisältää"
 
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Ryhmät"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/component/addressbook.c:834
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "Ryhmät:"
+
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Ei nimeä)"
+
 #: 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:1581
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 msgid "Primary Email"
 msgstr "Ensisijainen sähköposti"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1582
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1583
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
@@ -608,19 +666,19 @@ msgstr "Lisää osoite olemassaolevaan kontaktiin \"%s\""
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: 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
 msgid "Add to Contacts"
 msgstr "Lisää kontakteihin"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -641,10 +699,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:640
+#: 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:543 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Poista"
 
@@ -660,11 +718,11 @@ msgstr "Lähetä HTML-postia?"
 msgid "Unnamed Contact"
 msgstr "Nimetön kontakti"
 
-#: 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:484
+#: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -730,11 +788,11 @@ msgid "Details"
 msgstr "Yksityiskohtaiset"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
-msgstr ""
+#, fuzzy
+msgid "File A_s:"
+msgstr "Tiedoston tyyppi:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Yleiset"
 
@@ -758,180 +816,187 @@ msgstr "Puhelintyypit"
 msgid "Wants to receive _HTML mail"
 msgstr "Haluaa sähköpostit HTML-muodossa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "Kotisivun osoite:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "_Osoite..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "_Työ"
 
-#: 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:10
 msgid "_Contacts..."
 msgstr "_Kontaktit..."
 
-#: 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:1472 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: 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
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "_Koko nimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "_Koti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "_Tehtävänimike:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "Puoli_so:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "_Tämä on postitusosoite"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "Kotisivun osoite:"
+
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "Tämä kontakti kuuluu näihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1539
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1540
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "Työ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1541
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "Työ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1542
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "Työ/faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1543
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1544
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1545
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1546
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1547
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1548
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: 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:1550
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
-#: mail/mail-config.glade.h:49
+#: 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 "Muut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1552
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1553
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1554
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1555
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1556
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1557
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Kansion `%s' poistaminen epäonnistui: %s"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalisäys"
@@ -941,7 +1006,7 @@ msgid "Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "Koko nimi"
 
@@ -961,42 +1026,1023 @@ msgid "Address _2:"
 msgstr "Osoite _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Afghanistan"
+msgstr ""
+
+#: 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
+msgid "Antarctica"
+msgstr ""
+
+#: 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 "Suunta"
+
+#: 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 "Elokuu"
+
+#: 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 "vuotta"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "Koko"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+msgid "Benin"
+msgstr ""
+
+#: 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
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+msgid "Brazil"
+msgstr ""
+
+#: 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
 msgid "Canada"
 msgstr "Kanada"
 
-#: 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 "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "Kiinalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "Kiinalainen"
+
+#: 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 "Kirjoita"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "Kopioidaan"
+
+#: 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
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: 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
 msgid "Finland"
 msgstr "Suomi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "Yhdysvallat"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "Peruuta"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: 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 "Kreikkalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "Kanada"
+
+#: 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 "Yleiset"
+
+#: 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
+msgid "Haiti"
+msgstr ""
+
+#: 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 "tuntia"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "Sunnuntai"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#, fuzzy
+msgid "India"
+msgstr "Ideat"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#, fuzzy
+msgid "Ireland"
+msgstr "Korealainen"
+
+#: 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 "Japanilainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#, fuzzy
+msgid "Jordan"
+msgstr "Korealainen"
+
+#: 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 "Matalin"
+
+#: 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 "Matalin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+msgid "Liberia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "Maaliskuu"
+
+#: 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
+msgid "Malawi"
+msgstr ""
+
+#: 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 "_Matkapuhelin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "_Matkapuhelin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: 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 "Reunukset"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "Toukokuu"
+
+#: 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 "Maanantai"
+
+#: 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 "Matkapuhelin"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+msgid "Myanmar"
+msgstr ""
+
+#: 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 "Vastaa"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "Seuraava säie"
+
+#: 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 "Uusi kontakti"
+
+#: 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 "Korkeampi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "Korkeampi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "minuutti"
+
+#: 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 "Nyt"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "Liitä"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "Kanada"
+
+#: 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 "Paperi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#, fuzzy
+msgid "Pitcairn"
+msgstr "Tulosta kalenteri"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "Pysty"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "jälkeen"
+
+#: 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 "Alueet"
+
+#: 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 "Kanada"
+
+#: 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
+msgid "Samoa"
+msgstr ""
+
+#: 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 "Yleiset"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+msgid "Seychelles"
+msgstr ""
+
+#: 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 "Tavallinen"
+
+#: 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 "Varjostus"
+
+#: 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 "Su"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "Kutsumanimi"
+
+#: 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 "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "Näkemättä"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+msgid "Taiwan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tehtävät"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "Suomi"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "Vastaanottaja"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "Tänään"
+
+#: 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 "Ti"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Turkkilainen"
+
+#: 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 "Kanada"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukrainalainen"
+
+#: 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 "Nimetön viesti"
+
+#: 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 "Valitse nimet"
+
+#: 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 "Länsieurooppalainen"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "Näkemättä"
+
+#: 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
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr "_Osavaltio/lääni:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
@@ -1087,7 +2133,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
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "Poista"
@@ -1108,7 +2154,7 @@ msgid "Add Anyway"
 msgstr ""
 
 #: 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
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1130,30 +2176,31 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Changed Contact:"
+msgid "Change Anyway"
 msgstr "Muut kontaktit"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Muut kontaktit"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: 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
-msgid "_Change Anyway"
-msgstr ""
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:242
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:258
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "Etsi"
 
@@ -1267,10 +2314,10 @@ msgstr "z"
 
 #: 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:610
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: 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
 msgid "Save as VCard"
 msgstr ""
 
@@ -1280,37 +2327,37 @@ msgid "Open"
 msgstr "Avaa"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send contact to other"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "Uusi kontakti"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "Lähetä viesti kontaktille"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:675
-#: 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-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 "Tulosta"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 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
+#: 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:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Poista"
 
@@ -1327,8 +2374,8 @@ msgid "Success"
 msgstr "Lähteet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
-#: 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 "Tuntematon virhe"
 
@@ -1337,7 +2384,7 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: 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 ""
 
@@ -1354,8 +2401,11 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: 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 "Peruutettu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1384,133 +2434,133 @@ msgid "Error removing list"
 msgstr "Virhe %s:n lataamisessa"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1159
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 #, fuzzy
 msgid "Error removing card"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "Työosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:811
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:812
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1156
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 #, fuzzy
 msgid "Done."
 msgstr "Valmis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1188
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Ladataan kalenteria..."
@@ -1713,8 +2763,8 @@ msgstr "Tulosta kalenteri"
 msgid "Print card"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 #, fuzzy
 msgid "Print envelope"
 msgstr "Tulostuksen esikatselu"
@@ -1879,31 +2929,31 @@ msgstr "Bonobon alustus ei onnistunut"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:414
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. 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/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 "%a %d %b"
 
-#: 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 "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:435
 #, fuzzy, c-format
 msgid "%d"
 msgstr "d"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: 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 "%d %B %Y"
 msgstr "%A, %e %B %Y"
@@ -1911,13 +2961,13 @@ msgstr "%A, %e %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
+#: 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
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:579
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1954,20 +3004,20 @@ msgstr "L"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "Matala"
 
@@ -2002,20 +3052,13 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: 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:544
-#: camel/camel-service.c:580
-msgid "Cancelled"
-msgstr "Peruutettu"
-
 #. 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 "%a %d/%m/%Y %H:%M:%S"
 
 #. 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 "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -2055,14 +3098,13 @@ msgid "Undefined"
 msgstr "Määrittelemätön"
 
 #. 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:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1404
-#: mail/mail-accounts.c:134 mail/mail-accounts.c:374
-#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1380
-#: 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 "Määrittelemätön"
 
@@ -2076,13 +3118,13 @@ msgstr ""
 
 #: 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:1183
-#: calendar/gui/dialogs/meeting-page.c:1279
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Kyllä"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1280
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Ei"
 
@@ -2106,56 +3148,84 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:57
 #, fuzzy
 msgid "Description contains"
 msgstr "Kuvaus:"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: calendar/gui/cal-search-bar.c:378
-msgid "Category:"
-msgstr "Ryhmät:"
+#: 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
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
 
-#. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:498
-msgid "All"
+#: 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 "Tehtävät"
+
+#: calendar/gui/component-factory.c:56
+msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:503
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Uusi t_apaaminen"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "Luo uusi tehtävä"
+
+#: calendar/gui/component-factory.c:409
 #, fuzzy
-msgid "Unfiled"
-msgstr "Nimetön"
+msgid "New _Task"
+msgstr "Uusi tehtävä"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri näyttää"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Vastaanottajat"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "Näytä asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2206,104 +3276,104 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d päivää"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 day"
 msgstr " 1 päivä"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy
 msgid "1 week"
 msgstr " 1 viikko"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 tunti"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuuttia"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekunti"
 
-#: 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 "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: 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:1251
-#: calendar/gui/dialogs/meeting-page.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: 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 "Tuntematon"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "Muistuta minua kaikista tapaamisista"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "Luo uusi tapaaminen"
@@ -2315,7 +3385,6 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Päiväys & Aika"
@@ -2326,7 +3395,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -2356,7 +3425,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:113
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -2373,168 +3442,226 @@ msgid "10 minutes"
 msgstr "10 minuuttia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 tuntia (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 tuntia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Calendar Preferences"
-msgstr "Kalenterin asetukset"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "_Kalenterin asetukset..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "Tiivistä viikonloput"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:26
-msgid "Display"
-msgstr ""
+msgid "Create new appointments with a default _reminder"
+msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "End of day:"
-msgstr "Päivän loppu:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Days"
+msgstr "päivää"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "First day of wee_k:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Pe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "Ma"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Hours"
+msgstr "tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "Minutes"
+msgstr "minuutti"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Overdue tasks:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "O_verdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "La"
-
-#: 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
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: 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 "Näytä tapaamisten loppumisajat"
 
-#: 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 "Näytä viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Start of day:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "Sta_rt of day:"
 msgstr "Päivän alku:"
 
-#: 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 "Su"
 
-#: 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 "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
-msgid "Task List"
-msgstr "Tehtävät"
+msgid "T_hu"
+msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Tasks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "T_ue"
+msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "To"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Tas_ks due today:"
+msgstr ""
 
-#: 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
 msgid "Thursday"
 msgstr "Torstai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Time divisions:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
 msgstr ""
+"\n"
+"Aikavyöhyke: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "Mitat:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr ""
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "Työviikk_o"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 tuntia (am/pm)"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"Aikavyöhyke: "
+msgid "_24 hour"
+msgstr "24 tuntia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Ti"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Tiistai"
+#, fuzzy
+msgid "_Compress weekends in month view"
+msgstr "Tiivistä viikonloput"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Ke"
+#, fuzzy
+msgid "_Display"
+msgstr "_Päivä"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Keskiviikko"
+#, fuzzy
+msgid "_End of day:"
+msgstr "Päivän loppu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Work Week"
-msgstr "Työviikk_o"
+msgid "_Fri"
+msgstr "Pe"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_General"
+msgstr "Yleiset"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "Piilota _poistetut viestit"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Mon"
+msgstr "Ma"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Other"
+msgstr "Muut"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Sat"
+msgstr "La"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "_Task List"
+msgstr "Tehtävät"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Wed"
+msgstr "Ke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "before the start of the appointment"
+msgstr "Luo uusi tapaaminen"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2599,63 +3726,58 @@ 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:630 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:462
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:467
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:470
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:465
+#: calendar/gui/dialogs/comp-editor.c:473
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:479
+#: calendar/gui/dialogs/comp-editor.c:487
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2663,12 +3785,12 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2729,30 +3851,6 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-#, fuzzy
-msgid "Select a Time Zone"
-msgstr "Valitse tiedosto"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-#, fuzzy
-msgid "Selection:"
-msgstr "Käännä valinta"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-#, fuzzy
-msgid "Time Zones"
-msgstr ""
-"\n"
-"Aikavyöhyke: "
-
-#: 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/event-editor.c:156
 msgid "Appointment"
 msgstr "Tapaaminen"
@@ -2831,88 +3929,88 @@ msgstr "_Alkamisaika:"
 
 #: calendar/gui/dialogs/meeting-page.c:576
 #: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1247
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:578
 #: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1248
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, fuzzy
 msgid "Group"
 msgstr "Ryhmän nimi:"
 
 #: calendar/gui/dialogs/meeting-page.c:580
 #: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1249
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, fuzzy
 msgid "Resource"
 msgstr "Paperilähde:"
 
 #: calendar/gui/dialogs/meeting-page.c:582
 #: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1250
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:611
 #: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1263
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:613
 #: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1181
-#: calendar/gui/dialogs/meeting-page.c:1264
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:615
 #: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1265
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:617
 #: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1266
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:663
 #: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1189
-#: calendar/gui/dialogs/meeting-page.c:1292
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Needs Action"
 msgstr "Lisää toiminto"
 
 #: calendar/gui/dialogs/meeting-page.c:665
 #: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1293
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, fuzzy
 msgid "Accepted"
 msgstr "Hyväksy "
 
 #: calendar/gui/dialogs/meeting-page.c:667
 #: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1294
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
 #: calendar/gui/dialogs/meeting-page.c:669
 #: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1295
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
@@ -2928,35 +4026,35 @@ msgid "That person is already attending the meeting!"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
 #: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:838
-#: calendar/gui/dialogs/meeting-page.c:958
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
 #: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
 #: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:916
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "Lähetetyt"
 
-#: calendar/gui/dialogs/meeting-page.c:1467
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -3003,7 +4101,7 @@ msgid "Status"
 msgstr "Tila"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:83
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
@@ -3052,7 +4150,7 @@ msgstr ""
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr ""
 
@@ -3149,7 +4247,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
@@ -3240,51 +4338,53 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
-#: calendar/gui/e-week-view.c:3230 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
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
-#: calendar/gui/e-week-view.c:3239 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
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
-#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:32 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
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
-#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
-#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:35 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
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Poista tämä tehtävä"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista tehtävä"
 
-#: calendar/gui/e-calendar-table.c:1129
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+msgid "Click to add a task"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:3
@@ -3324,7 +4424,11 @@ msgstr "Prioriteetti"
 msgid "Start Date"
 msgstr ""
 
+#. 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 "Kuvaus"
 
@@ -3367,120 +4471,228 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3357
-msgid "New _Appointment"
-msgstr "Uusi t_apaaminen"
-
-#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
-#: 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
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "P_oista tämä tapaaminen"
 
-#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Valinnaiset tiedot"
+
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Peruuta tapaaminen"
+
+#: 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 "Meeting Update"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is a meeting request."
+#: calendar/gui/e-itip-control.c:633
+msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:637
+#, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a request for the latest event information."
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Valitse toiminto"
+
+#: 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:712
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Hae viestistä"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
-#: calendar/gui/e-itip-control.c:783
-msgid "The message is not understandable."
-msgstr "Viesti ei ole ymmärrettävissä."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is an task that can be added to your calendar."
+#: 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:743
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:671
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a request for the latest task information."
+#: 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:749
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "Tehtävät"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:752
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:681
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is freebusy information."
+#: 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:777
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "Vastaa"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:691
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Peruuta operaatio"
+
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Hae viestistä"
+
+#: calendar/gui/e-itip-control.c:713
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:837
-msgid "The message does not appear to be properly formed"
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Lähteen tiedot"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:856
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:880
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Edellinen viesti"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1018
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "En pystynyt poistamaan kohtaa kalenteritiedostostasi!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "Lähetetty"
+
+#: 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
 #, no-c-format
 msgid "%P %%"
@@ -3528,16 +4740,16 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3598,7 +4810,7 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:228
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3754,12 +4966,6 @@ msgstr "Pe"
 msgid "Sa"
 msgstr "La"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
-#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1025
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tehtävät"
-
 #. Day
 #: calendar/gui/print.c:1815
 msgid "Selected day (%a %b %d %Y)"
@@ -3793,9 +4999,8 @@ msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1854 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
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -3917,8 +5122,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:663
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:705
@@ -3931,7 +5136,11 @@ msgid ""
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:967
+#: 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 ""
 
@@ -3992,6 +5201,7 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d%%)"
 
@@ -4238,7 +5448,7 @@ msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
 #: 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 ""
@@ -4368,7 +5578,7 @@ msgstr "Tuntematon todennustila."
 
 #: 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:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Salasana"
 
@@ -4398,37 +5608,37 @@ msgstr ""
 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
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: 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 ""
@@ -4492,7 +5702,7 @@ msgstr "Viestin salauksen purkaminen epäonnistui."
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4500,7 +5710,7 @@ msgid ""
 msgstr ""
 
 #. 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"
@@ -4584,21 +5794,21 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr "Etsitään muuttuneita viestejä"
 
-#: 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
 msgid "This message is not currently available"
 msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 
-#: 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
 msgid "Scanning for new messages"
 msgstr "Etsitään uusia viestejä"
 
-#: 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 ""
 
@@ -4615,7 +5825,7 @@ msgstr "Tarkastetaan onko uutta sähköpostia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:653
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -4653,7 +5863,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
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4664,7 +5874,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 "Et antanut salasanaa."
 
@@ -4676,12 +5886,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
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: 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 ""
 
@@ -4922,14 +6132,15 @@ msgstr ""
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
 #: camel/providers/local/camel-spool-summary.c:379
-msgid "Summarising folder"
-msgstr ""
+#, fuzzy
+msgid "Summarizing folder"
+msgstr "Synkronoidaan kansiota"
 
 #: 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"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -4938,25 +6149,23 @@ 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 "Kansion hakeminen ei onnistu: %s: %s"
 
 #: 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:1549
-msgid "Synchronising folder"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing folder"
 msgstr "Synkronoidaan kansiota"
 
 #: 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"
-msgstr ""
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -5058,6 +6267,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: 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
@@ -5146,35 +6366,35 @@ 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
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Uusien viestien haku POP-palvelimelta epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:239
+#: 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:332
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Viestin hakeminen epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:348
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:375
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
@@ -5192,7 +6412,7 @@ msgstr "Jätä viestit palvelimelle"
 msgid "Delete after %s day(s)"
 msgstr "Poista %s:n päivän kuluttua"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5271,7 +6491,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5323,7 +6543,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:63
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5331,122 +6551,122 @@ msgstr "SMTP"
 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
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr ""
 
-#: 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
 msgid "A password transition is needed"
 msgstr ""
 
-#: 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
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: 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
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5454,125 +6674,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: 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 "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty."
 
-#: 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 "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: 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
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: 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
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr ""
 
-#: 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
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: 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 ""
@@ -5602,7 +6822,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. 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
 msgid "attachment"
 msgstr "liite"
 
@@ -5693,7 +6913,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer.c:687
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5702,7 +6922,7 @@ msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5711,58 +6931,58 @@ msgstr ""
 "Tiedoston %s lukeminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:874
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1014
+#: 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:1064
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1078
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5771,15 +6991,16 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1193
+#: composer/e-msg-composer.c:1172
+#, fuzzy
 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 ""
 "Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
 "istunnolta. Haluatko koittaa palauttaa niitä?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5789,24 +7010,24 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1348 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:1371
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1499
 msgid "Insert File"
 msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Viestin kirjoitusikkunan luominen epäonnistui."
 
@@ -5832,55 +7053,101 @@ msgstr ""
 msgid "calendar information"
 msgstr ""
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "sisältää"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "ei sisällä"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "ei sisällä"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Nimi sisältää"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Kuvaus:"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Nimi sisältää"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Nimi sisältää"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "ei sisällä"
+
 #. 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 "%d/%m/%Y"
 
 #. 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
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. 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
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. 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
 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
 #, c-format
 msgid "%x"
 msgstr ""
 
 #. 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"
@@ -5888,13 +7155,13 @@ msgstr "%a %d/%m/%Y"
 
 #. 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 "%a %d/%m/%Y %H:%M"
 
 #. 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
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5984,7 +7251,7 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "nyt"
 
@@ -5996,11 +7263,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr ""
 
@@ -6020,7 +7291,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:796
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr ""
 
@@ -6032,7 +7303,7 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:197
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6080,30 +7351,22 @@ msgid "outgoing"
 msgstr "lähtevät"
 
 #: filter/filter.glade.h:1
-msgid "Add"
-msgstr "Lisää"
-
-#: filter/filter.glade.h:3
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr ""
 
@@ -6221,7 +7484,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "Lähettäjä"
 
@@ -6343,14 +7606,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 "Tuo"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
 
@@ -6378,11 +7640,11 @@ msgstr ""
 "Evolution löysi GnomeCardin tiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "Asetukset"
 
-#: 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?"
@@ -6438,166 +7700,180 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "Suodata postituslistan mukaan"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "Tämä kansio ei voi sisältää viestejä."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 msgid "Change this folder's properties"
 msgstr "Muuta tämän kansion ominaisuuksia"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "Seuraava viesti"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "Seuraava viesti"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
-#: 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
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:258
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:232 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:909
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Luo viestistä suodatin"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/folder-browser.c:1266
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "R_esend..."
-msgstr "Lähetä uudelleen"
+msgid "_Edit as New Message..."
+msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1311
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1313
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1329
 msgid "Add Sender to Address Book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1491
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-info.c:60
+#: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Valinnaiset tiedot"
@@ -6659,15 +7935,15 @@ msgid "Evolution News Editor"
 msgstr "Evolutionin uutismuokkain"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:162
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:999
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-account-gui.c:992
+#: mail/mail-account-gui.c:1005
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6677,38 +7953,43 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: 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
 msgid " (default)"
 msgstr " (oletus)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Älä käytä"
 
-#: mail/mail-accounts.c:176
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Käytä"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "Älä poista"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:495 mail/mail-accounts.c:499
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "Haluatko varmasti poistaa tämän keskusteluryhmätilin?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:741
-msgid "Evolution Account Manager"
-msgstr "Evolutionin tilienhallinta"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "_Sähköpostiasetukset..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6734,7 +8015,7 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: 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"
@@ -6746,23 +8027,23 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestejä.\n"
 "Haluatko tehdä asetukset nyt?"
 
-#: 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
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6770,7 +8051,7 @@ msgstr ""
 "Viestillä ei ole aihetta.\n"
 "Lähetetäänkö toedella?"
 
-#: 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 "
@@ -6778,38 +8059,37 @@ 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 ""
 "Sinuun tulee määritellä vastaanottajat ennen tämän viestin lähettämistä."
 
-#: mail/mail-callbacks.c:389
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr "Sinun tulee luoda tili ennen kuin voit lähettää tätä viestiä."
 
 #: mail/mail-callbacks.c:632
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "%s %s kirjoitti:"
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "Välitetty viesti:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1383
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6817,7 +8097,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6825,87 +8105,121 @@ msgstr ""
 "Voit lähettää uudelleen vain\n"
 "\"Lähetetyt\"-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Haluatko todella lähettää kaikki %d viestiä uudelleen?"
 
-#: mail/mail-callbacks.c:1450
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "Ei viestejä valittuna"
 
-#: mail/mail-callbacks.c:1534
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellä..."
 
-#: mail/mail-callbacks.c:1536
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellä..."
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Varoitus"
+
+#: 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 "Älä kysy tätä enää uudelleen"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1769
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:1815
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1861
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: 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:463
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:1570
+#. 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 "Saapuneet"
+
+#: mail/mail-config.c:1809
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1641 mail/mail-config.c:1644
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr ""
 
@@ -6991,11 +8305,15 @@ msgstr ""
 msgid "Digital IDs..."
 msgstr ""
 
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr ""
+
 #: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "Luonnokset"
 
@@ -7007,298 +8325,305 @@ msgstr "Luonnoskansio:"
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "Tallenna tiedosto uudella nimellä"
+
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Käytä"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML-allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Message _preview should be displayed by default"
 msgstr "Viestin _esikatselu on käytössä oletuksena"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "Uutiset"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sähköpostia"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "Lähetetään sähköpostia"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: mail/mail-config.glade.h:71 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 "Lähetetyt"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "Lähetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "Lähetettyjen kansio:"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Server requires _authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Lähde"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Lähteen tiedot"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Lähteet"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 msgid "Use secure connection (_SSL)"
 msgstr "Käytä salattua yhteyttä (_SSL)"
 
-#: mail/mail-config.glade.h:85
+#: 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:89
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "_Automatically check for new mail every"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "_Check for supported types"
 msgstr "Tar_kista tuetut tavat"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "_Email Address:"
 msgstr "Sähköpostiosoit_e:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "_HTML Signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr "_Korosta lainaukset värillä"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "_Mark messages as Read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "_Organization:"
 msgstr "_Organisaatio:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "Lähetä sähköpostit oletuksena _HTML-muodossa."
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "Allekirjoitu_stiedosto:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr "sekuntia."
 
@@ -7338,76 +8663,82 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: 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 "Piilota"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "Ladataan viestin sisältöä"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimellä"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimellä..."
 
-#: mail/mail-folder-cache.c:146
+#: mail/mail-folder-cache.c:147
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:162
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Poistettu"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d unsent"
 msgstr "%d lähettämätöntä"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr "%d yhteensä"
@@ -7498,17 +8829,22 @@ msgstr ""
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:459
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "Ei kyseistä viestiä: %s"
+
+#: mail/mail-local.c:460
 #, c-format
-msgid "Opening '%s'"
+msgid "Registering '%s'"
 msgstr ""
 
-#: 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"
@@ -7576,7 +8912,7 @@ msgstr "Lähetetään viestiä %d / %d"
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "Valmis."
 
@@ -7608,7 +8944,7 @@ msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -7616,7 +8952,7 @@ msgstr "Roskakori"
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
@@ -7626,65 +8962,75 @@ msgstr ""
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "Poistetaan kansiota %s"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "Synkronoidaan kansiota"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1751
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2131
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
@@ -7697,31 +9043,31 @@ msgstr "_Etsi"
 msgid "(Untitled Message)"
 msgstr "(Nimetön viesti)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 msgid "Untitled Message"
 msgstr "Nimetön viesti"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 msgid "Empty Message"
 msgstr "Tyhjä viesti"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "Hae viestistä"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkitystä"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr "Osumia:"
 
@@ -7741,7 +9087,7 @@ msgstr "Päivitetään..."
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:507
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "Peruutettu."
 
@@ -7763,15 +9109,15 @@ msgstr "Välitetty viesti - %s"
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "Välitetty viesti"
 
-#: mail/mail-vfolder.c:282
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:502
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr ""
 
@@ -7784,63 +9130,59 @@ msgstr "(Ei aihetta)"
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "Nähty"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: mail/message-list.c:631
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:632
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:633
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:637
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:929
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/message-list.c:931
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -7848,10 +9190,6 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: mail/message-list.c:2324
-msgid "Updating message list"
-msgstr "Päivitetään viestiluetteloa"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
@@ -7864,39 +9202,76 @@ msgstr "Otettu vastaan"
 msgid "Size"
 msgstr "Koko"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:174
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:176
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "Paikalliset kansiot"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "Näytä toinen kansio"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Kuvaus:"
+
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Tilaa"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Poista tilaus"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -7905,7 +9280,11 @@ msgstr ""
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: 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
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
@@ -7925,33 +9304,43 @@ msgstr ""
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:105
+#: my-evolution/e-summary-mail.c:111
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#: 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
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:881
+#: my-evolution/e-summary-preferences.c:889
 msgid "Name:"
 msgstr "Nimi:"
 
-#: my-evolution/e-summary-preferences.c:1403
-msgid "My Evolution Settings"
-msgstr "Evolutionin aseukseni"
+#: my-evolution/e-summary-preferences.c:1421
+#, fuzzy
+msgid "Summary Settings"
+msgstr "Yhteenveto sisältää"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -7961,6 +9350,11 @@ msgstr ""
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Virhe ladattaessa RDF:ää</b>"
 
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "_Uusi kansio"
+
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "Ei tehtäviä"
@@ -7969,30 +9363,74 @@ msgstr "Ei tehtäviä"
 msgid "My Weather"
 msgstr "Säätiedot"
 
-#: 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 "<dd><b>Säätietopalvelimeen ei saatu yhteyttä</b></dd>"
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "Säätiedot"
+
+#: my-evolution/e-summary-weather.c:664
 msgid "Regions"
 msgstr "Alueet"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr ""
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %d, %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Print Summary"
+msgstr "Kuvaus"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr ""
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "Viestin tulostus epäonnistui"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+msgid "°F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "°C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Kirjasinlajit"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Siirretään"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Suodattimet"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Suodattimet"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -9165,10 +10603,6 @@ msgstr "Paikalliset kansiot"
 msgid "All news _feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1024
-msgid "Calendar"
-msgstr "Kalenteri"
-
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Kuinka monta päivää kalenterissa näytetään kerrallaan?"
@@ -9290,7 +10724,15 @@ msgstr "Näytä yksityiskohdat"
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
-#: shell/e-local-storage.c:551
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: shell/e-local-storage.c:178
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:593
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
@@ -9343,7 +10785,7 @@ msgid ""
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9351,7 +10793,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"
@@ -9360,7 +10802,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"
@@ -9380,48 +10822,55 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: 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
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: 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
 msgid "Move folder"
 msgstr "Siirä kansio"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:374
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Poista kansio '%s'"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:377
+#: shell/e-shell-folder-commands.c:384
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Haluatko todella poistaa kansion '%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:452
+#: shell/e-shell-folder-commands.c:459
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Nimeä kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:464
+#: shell/e-shell-folder-commands.c:471
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Kansion nimi:"
@@ -9447,11 +10896,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 "Uusi..."
 
-#: 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
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
@@ -9481,7 +10930,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9524,7 +10973,7 @@ msgstr ""
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
@@ -9532,11 +10981,11 @@ msgstr "Valitse tiedosto"
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
@@ -9544,105 +10993,127 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: 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 "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: 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 "Bug budday ei löytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: 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
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:702
+#: shell/e-shell-view-menu.c:684
 msgid "Work Online"
 msgstr "Työskentele linjoilla"
 
-#: 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
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1385
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1387
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1425
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1432
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:491
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1405
+#: 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:1609 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1611
+#: shell/e-shell.c:1644
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1613
+#: shell/e-shell.c:1646
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1615
+#: shell/e-shell.c:1648
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1617 shell/e-storage.c:481
+#: shell/e-shell.c:1650 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -9733,7 +11204,7 @@ msgstr "Oikotien uusi nimi:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Avaa tämän oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
@@ -9749,74 +11220,69 @@ msgstr "Nimeä tämä oikotie uudelleen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista tämä oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:620
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteitä."
 
-#: shell/e-shortcuts.c:1019
+#: shell/e-shortcuts.c:1040
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1023
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontaktit"
-
-#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
-msgid "My Evolution"
-msgstr ""
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Ei nimeä)"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
+#: shell/e-storage.c:511
+msgid "The specified folder cannot be modified or removed"
+msgstr ""
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
 #: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:175
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
@@ -9849,17 +11315,28 @@ msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
 #: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr ""
+#, fuzzy
+msgid "Evolution Import Assistant"
+msgstr "Evolutionin asennus"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
+msgstr "Evolutionin asennus"
+
+#: 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 "Valitse tiedosto"
+
 #: 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 ""
 
@@ -9876,7 +11353,7 @@ msgid "Don't ask me again"
 msgstr "Älä kysy tätä enää uudelleen"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #: shell/main.c:95
@@ -9904,29 +11381,29 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:154
+#: shell/main.c:173
 msgid "Cannot access the Evolution shell."
 msgstr ""
 
-#: shell/main.c:163
+#: shell/main.c:184
 #, c-format
 msgid "Cannot initialize the Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:221
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr ""
 
-#: 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
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
-#: 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 "Kopioi"
 
@@ -9942,11 +11419,11 @@ msgstr "Luo uusi kontakti"
 msgid "Create new contact list"
 msgstr "Luo uusi kontaktiluettelo"
 
-#: 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 "Leikkaa"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
@@ -9954,89 +11431,93 @@ msgstr "Leikkaa valinta"
 msgid "Delete selected contacts"
 msgstr "Poista valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Uusi kontakti"
-
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+#, fuzzy
+msgid "New List"
 msgstr "Uusi luettelo"
 
-#: 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 "Liitä"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Esikatselee tulostettavia kontakteja"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tulosta valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Valitse kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
-msgstr "Lähetä _viesti kontaktille"
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "Lähetä _viesti kontaktille..."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "Lähetä viesti kontaktille"
+
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Pysäytä lataaminen"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: 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:25
+#: 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
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "_Osoitekirjan lähteet..."
 
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "_Kontaktiluettelo"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
-#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "_Kontaktit..."
+
+#: 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
 msgid "_Print..."
 msgstr "T_ulosta..."
 
@@ -10045,16 +11526,18 @@ msgid "_Save as VCard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:38
-msgid "_Search for contacts"
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "_Etsi kontakteja"
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: 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
 msgid "_Tools"
 msgstr "T_yökalut"
 
@@ -10063,108 +11546,130 @@ msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All-Day _Event"
+#, fuzzy
+msgid "Create a New All Day _Event"
 msgstr "Luo uusi koko päivän _tapahtuma"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a _New Appointment"
-msgstr "Luo uusi t_apaaminen"
+#, fuzzy
+msgid "Create a New _Task"
+msgstr "Luo uusi tehtävä"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
+msgid "Create a _New Appointment"
+msgstr "Luo uusi t_apaaminen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr "Luo uusi koko päivän tapahtuma"
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Day"
+msgstr "_Päivä"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "Poista tämä tapaaminen"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Siirry"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
-msgstr ""
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
+msgstr "Välitä"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "Siirry nykyiseen aikaan"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "Siirry tähän päivään"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "_Kuukausi"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "Uusi tehtävä"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "Tulosta kalenteri"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Tulostuksen esikatselu"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
+#: ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy Information"
-msgstr ""
-
-#: 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
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "Näytä 1 päivä"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "Näytä 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "Näytä 1 viikko"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Näytä työviikko"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "Työviikk_o"
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "Week"
+msgstr "_Viikko"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
 msgstr "T_apaaminen..."
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "_Calendar Settings..."
 msgstr "_Kalenterin asetukset..."
 
-#: ui/evolution-calendar.xml.h:33
-msgid "_Day"
-msgstr "_Päivä"
-
-#: ui/evolution-calendar.xml.h:34
-msgid "_Month"
-msgstr "_Kuukausi"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Pakolliset tiedot"
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Week"
-msgstr "_Viikko"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "_Tehtävä"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10175,15 +11680,16 @@ msgid "Close"
 msgstr "Sulje"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Sulje tämä tapaaminen"
+#, fuzzy
+msgid "Close this item"
+msgstr "Poista tämä kohta"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Poista tämä tapaaminen"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Poista tämä kohta"
 
 #: 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 ""
 
@@ -10191,89 +11697,58 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Esikatsele tulostettavaa kohtaa"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
-msgid "Print Pre_view"
-msgstr "Tulostuksen esikatselu"
-
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print S_etup"
-msgstr "Tulostusasetuks_et"
-
-#: 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
 msgid "Print this item"
 msgstr "Tulosta tämä kohta"
 
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ui/evolution-comp-editor.xml.h:15
+#: 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 "Tallenna"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+#: ui/evolution-comp-editor.xml.h:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "Tallenna luettelo ja sulje ikkuna"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: 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:41
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Poista tämä kohta"
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "Ohje"
-
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:8
-#: 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:244
-msgid "Save"
-msgstr "Tallenna"
-
-#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "Lähetä _viesti kontaktille..."
-
-#: ui/evolution-contact-editor.xml.h:17
+#: 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
@@ -10304,19 +11779,19 @@ msgstr ""
 msgid "Cancel Mee_ting"
 msgstr "Peruuta _tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: 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
 msgid "Forward as i_Calendar"
 msgstr ""
 
-#: 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
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10328,7 +11803,7 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -10345,37 +11820,38 @@ msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "Kirjoita"
-
-#: ui/evolution-mail-global.xml.h:4
 msgid "Compose _New Message"
 msgstr "Kirjoita uusi viesti"
 
-#: 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
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "_Unohda salasanat"
 
-#: 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 "Seuraava viesti"
+
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr ""
@@ -10432,96 +11908,101 @@ msgstr ""
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected messages"
 msgstr "Kopioi valitut viestit"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "Leikkaa"
+
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
 msgstr "Leikkaa valitut viestit"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Piilota valitut vi_estit"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Piilota _luetut viestit"
 
-#: 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
 msgid "Mark All as R_ead"
 msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Merkitse kaikki näkyvät viestit luetuiksi"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
 msgstr "Liitä viesti leikepöydälle"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: 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
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Valitse _säie"
 
-#: 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
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Näytä piil_otetut viestit"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
 
-#: 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 "Piilota kaikki luetut viestit väliaikaisesti"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Piilota valitut viestit väliaikaisesti"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Säikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Käännä valinta"
 
@@ -10742,7 +12223,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Avaa valittu viesti muokkaimeen uudelleenlähettämistä varten"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10761,38 +12243,34 @@ msgstr "Edellinen viesti"
 msgid "Previous Unread Message"
 msgstr "Edellinen lukematon viesti"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Tulosta viesti..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Tulostuksen esikatselu..."
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "_Etsi viestiä"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
@@ -10845,30 +12323,26 @@ msgstr ""
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "_Välitetä viesti"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Re-send Message"
-msgstr "Lähetä viesti _uudelleen"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
@@ -10876,12 +12350,12 @@ msgstr "Sulje tämä ikkuna"
 #: 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:37
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Näytä"
 
@@ -11072,7 +12546,7 @@ msgstr "_Vastausosoite-kenttä"
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -11105,14 +12579,27 @@ msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
 #: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Peruuta tehtävä"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Delegoi tehtävä"
+#: ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Cancel this task"
+msgstr "Peruuta tehtävä"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr ""
 
@@ -11120,39 +12607,28 @@ msgstr ""
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "Kopioi valittu tehtävä"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Luo uusi tehtävä"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "Leikkaa valittu tehtävä"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "Uusi tehtävä"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Liitä tehtävä leikepöydältä"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Save task as something else"
-msgstr "Tallenna tehtävä jossain muussa muodossa"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings"
+#, fuzzy
+msgid "Tasks Settings..."
 msgstr "Tehtävän asetukset"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "_Tehtävä"
 
@@ -11209,133 +12685,130 @@ msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr ""
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Siirrä tämä kansio toiseen paikkaan"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "Avaa valittu kansio uudessa ikkunassa"
 
-#: 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 "Lähetä virheraportti"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "Lähetä _virheraportti"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä virheraportti käyttäen Bug Buddy:a"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "Määritä"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "Määritä, näytetäänkö kansiopalkki"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Määritä, näytetäänkö oikotiepalkki"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "_Kalenterin käyttö"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
-msgstr ""
-
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr ""
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
+msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Siirrä..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Nimeä uudelleen..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Oikotie"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Change the settings for the summary"
+msgstr "Muuta tämän kansion nimeä"
 
 #: ui/my-evolution.xml.h:4
-msgid "_My Evolution Settings..."
+#, fuzzy
+msgid "Print summary"
+msgstr "Postin yhteenveto"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "Lue"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
 msgstr ""
 
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
+msgstr "_Sähköpostiasetukset..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Osoitekortit"
@@ -11368,6 +12841,30 @@ msgstr "Viestit"
 msgid "With Category"
 msgstr "Ryhmän mukaan"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Valitse tiedosto"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Käännä valinta"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Aikavyöhyke: "
+
+#: 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
@@ -11462,15 +12959,15 @@ msgstr "MTKTPLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "Nyt"
 
-#: 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
 msgid "Today"
 msgstr "Tänään"
 
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -11560,6 +13057,16 @@ msgstr ""
 msgid "Save Search"
 msgstr "Tallenna haku"
 
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "Tallenna haku"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "Kalenteri"
+
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Näytä kaikki"
@@ -11568,10 +13075,6 @@ msgstr "Näytä kaikki"
 msgid "Information"
 msgstr "Tiedoksi"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Varoitus"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Virhe"
@@ -11589,11 +13092,11 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: widgets/misc/e-search-bar.c:312
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "_Etsi"
 
-#: widgets/misc/e-search-bar.c:407
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -11617,6 +13120,91 @@ msgstr "init_corba(): GNOME:n alustus epäonnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus epäonnistui"
 
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Kuvaus"
+
+#~ msgid "USA"
+#~ msgstr "Yhdysvallat"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "Peruutettu"
+
+#, fuzzy
+#~ msgid "Unfiled"
+#~ msgstr "Nimetön"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Kalenterin asetukset"
+
+#~ msgid "The message is not understandable."
+#~ msgstr "Viesti ei ole ymmärrettävissä."
+
+#~ msgid "Add"
+#~ msgstr "Lisää"
+
+#~ msgid "Edit"
+#~ msgstr "Muokkaa"
+
+#, fuzzy
+#~ msgid "R_esend..."
+#~ msgstr "Lähetä uudelleen"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolutionin tilienhallinta"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "%s %s kirjoitti:"
+
+#~ msgid "Updating message list"
+#~ msgstr "Päivitetään viestiluetteloa"
+
+#~ msgid "My Evolution Settings"
+#~ msgstr "Evolutionin aseukseni"
+
+#~ msgid "New contact"
+#~ msgstr "Uusi kontakti"
+
+#~ msgid "Send _message to contact"
+#~ msgstr "Lähetä _viesti kontaktille"
+
+#~ msgid "Go to present time"
+#~ msgstr "Siirry nykyiseen aikaan"
+
+#~ msgid "Print calendar"
+#~ msgstr "Tulosta kalenteri"
+
+#~ msgid "W_ork Week"
+#~ msgstr "Työviikk_o"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Sulje tämä tapaaminen"
+
+#~ msgid "Print S_etup"
+#~ msgstr "Tulostusasetuks_et"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+
+#~ msgid "Help"
+#~ msgstr "Ohje"
+
+#~ msgid "Print Preview..."
+#~ msgstr "Tulostuksen esikatselu..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "Lähetä viesti _uudelleen"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Delegoi tehtävä"
+
+#~ msgid "Save task as something else"
+#~ msgstr "Tallenna tehtävä jossain muussa muodossa"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "_Kalenterin käyttö"
+
 #~ msgid "Category contains"
 #~ msgstr "Ryhmä sisältää"
 
@@ -11646,9 +13234,6 @@ msgstr "init_bonobo(): Bonobon alustus epäonnistui"
 #~ msgid "Holiday"
 #~ msgstr "Lomapäivä"
 
-#~ msgid "Ideas"
-#~ msgstr "Ideat"
-
 #~ msgid "Key Customer"
 #~ msgstr "Avainasiakas"
author	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-23 07:18:14 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-23 07:18:14 +0800
commit	df73d86dcb9f2a9b2177d6694c68c0ebe432b364 (patch)
tree	badb87b38dc4b74df00899b45d774054672cc19a /po/fi.po
parent	d9e5feffa70559cb7ff8201c1493e0a0f2ca9af9 (diff)
download	gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.gz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.bz2 gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.lz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.xz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.zst gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.zip