Finnish translation updated by Jarkko Ranta <jjranta@cc.joensuu.fi>

svn path=/trunk/; revision=11918

2 files changed, 2275 insertions, 2586 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 878a1952f8..861bfacfa5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-08  Sami Pesonen  <spesonen@dlc.fi>
+	* fi.po: Updated Finnish translation by
+	Jarkko Ranta <jjranta@cc.joensuu.fi>
+
 2001-08-11  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation. Also thanks to
diff --git a/po/fi.po b/po/fi.po
index b905f241ac..54fce23bd1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-11 23:25+0300\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 +21,11 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3624
 msgid "Card: "
 msgstr "Kortti: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3628
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Family:     "
@@ -65,13 +65,13 @@ msgstr ""
 "\n"
 "  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "Birth Date: "
@@ -79,7 +79,7 @@ msgstr ""
 "\n"
 "Syntymäpäivä: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "Address:"
@@ -87,7 +87,7 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -95,13 +95,13 @@ msgstr ""
 "\n"
 "  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "  Street:      "
@@ -109,7 +109,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3661
 msgid ""
 "\n"
 "  City:        "
@@ -117,13 +117,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3662
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +131,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3664
 msgid ""
 "\n"
 "  Country:     "
@@ -139,13 +139,13 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3677
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3689
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "Sähköposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "E-mail:"
@@ -177,13 +177,13 @@ msgstr ""
 "\n"
 "Sähköposti:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +191,7 @@ msgstr ""
 "\n"
 "Aikavyöhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3756
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3768
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3769
 msgid ""
 "\n"
 "  Name:  "
@@ -219,7 +219,7 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3770
 msgid ""
 "\n"
 "  Unit:  "
@@ -227,7 +227,7 @@ msgstr ""
 "\n"
 "  Yksikkö: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3771
 msgid ""
 "\n"
 "  Unit2: "
@@ -235,7 +235,7 @@ msgstr ""
 "\n"
 "  Yksikkö2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "  Unit3: "
@@ -243,7 +243,7 @@ msgstr ""
 "\n"
 "  Yksikkö3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "  Unit4: "
@@ -251,7 +251,7 @@ msgstr ""
 "\n"
 "  Yksikkö4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Categories: "
@@ -259,7 +259,7 @@ msgstr ""
 "\n"
 "Ryhmät: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3778
 msgid ""
 "\n"
 "Comment: "
@@ -275,13 +275,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3791
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3794
 msgid ""
 "\n"
 "Public Key: "
@@ -289,11 +289,11 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4066
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4074
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:46
+#: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
@@ -379,202 +379,159 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP-palvelin"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Tiedosto"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tuntematon osoitekirjatyyppi"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "Muokkaa osoitekirjaa"
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
-msgid "Password"
-msgstr "Salasana"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
+msgstr "Tilin nimi"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Lisää osoitekirja"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Advanced"
+msgstr "Edistynyt"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:7
+msgid "De_lete"
+msgstr "_Poista"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "Search _base:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Search s_cope: "
 msgstr ""
 
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr "Muista tämä salasana"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "Server Name"
+msgstr "Palvelimen nimi"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "Isäntäpalvelin:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "The information below is required in order to add an addressbook.  "
+msgstr "Allaolevat tiedot vaaditaan osoitekirjan lisäämiseksi.  "
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "This information is not required for most ldap servers. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Portti:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+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.c:479
-msgid "Authentication:"
-msgstr "Todennus:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid "This is the name of the server where your addressbook is located."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:69
-msgid "Path:"
-msgstr "Polku:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the port that your ldap server uses."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Luo polku mikäli sitä ei ole olemassa."
-
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Muokkaa osoitekirjaa"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Lisää osoitekirja"
-
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Valitse osoitekirjan tyyppi, ja anna sen jälkeen tarpeelliset tiedot siitä."
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Nimi:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
+"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.c:694
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Osoitekirjan lähteet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "De_lete"
-msgstr "Poista"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Nimi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid "_Account name:"
+msgstr "_Tilin nimi:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:108
+#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Lisää"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: mail/mail-config.glade.h:93 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:46
+#: ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:23
+msgid "_My server requires authentication"
+msgstr "Palveli_meni vaati todennuksen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_Port:"
+msgstr "_Portti:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid "_Server name:"
+msgstr "Palvelimen _nimi: "
+
+#: addressbook/gui/component/addressbook-storage.c:135
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:345
+#: addressbook/gui/component/addressbook.c:372
 #, c-format
-msgid "Enter password for %s"
+msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:380
+msgid "LDAP Authentication"
+msgstr "LDAP-Todennus"
+
+#: addressbook/gui/component/addressbook.c:391
+msgid "Email Address:"
+msgstr "Sähköpostiosoite:"
+
+#: addressbook/gui/component/addressbook.c:404
+msgid "Password:"
+msgstr "Salasana:"
+
+#: addressbook/gui/component/addressbook.c:467
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:474
 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:385
+#: addressbook/gui/component/addressbook.c:479
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -582,95 +539,98 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:487
 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:554
+#: addressbook/gui/component/addressbook.c:638
+#: calendar/gui/cal-search-bar.c:54
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:639
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:640
 msgid "Email contains"
 msgstr "Sähköposti sisältää"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:641
 #, fuzzy
-msgid "Category contains"
-msgstr "Nimi sisältää"
+msgid "Category is"
+msgstr "Ryhmät"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Edistyneet..."
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:834
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
 #: 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:1536
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
 msgid "Primary Email"
 msgstr "Ensisijainen sähköposti"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1537
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1538
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:802
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
 #: addressbook/gui/component/e-address-popup.c:579
-#, fuzzy
 msgid "Select an Action"
-msgstr "Valitse tiedosto"
+msgstr "Valitse toiminto"
 
 #: addressbook/gui/component/e-address-popup.c:585
-#, fuzzy, c-format
+#, c-format
 msgid "Create a new contact \"%s\""
-msgstr "Luo uusi kontakti"
+msgstr "Luo uusi kontakti \"%s\""
 
 #: addressbook/gui/component/e-address-popup.c:597
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr ""
+msgstr "Lisää osoite olemassaolevaan kontaktiin \"%s\""
 
 #: addressbook/gui/component/e-address-popup.c:859
-#, fuzzy
 msgid "Querying Addressbook..."
-msgstr "Muokkaa osoitekirjaa"
+msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:916
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: 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-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: 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
-#, fuzzy
 msgid "Merge E-Mail Address"
-msgstr "Sähköpostiosoite:"
+msgstr ""
 
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
-msgstr ""
+msgstr "Älä salli kyselyjä"
 
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Enable Queries (Dangerous!)"
-msgstr ""
+msgstr "Salli kyselyt (Vaarallista!)"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -681,13 +641,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:630
+#: addressbook/gui/component/select-names/e-select-names.c:640
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:481
+#: filter/filter-rule.c:543 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Poista"
 
@@ -696,41 +653,54 @@ msgid "Remove All"
 msgstr "Poista kaikki"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:195
-#, fuzzy
 msgid "Send HTML Mail?"
-msgstr "Lähtevä posti"
+msgstr "Lähetä HTML-postia?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
-#, fuzzy
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 msgid "Unnamed Contact"
-msgstr "Muut kontaktit"
+msgstr "Nimetön kontakti"
 
 #: addressbook/gui/component/select-names/e-select-names.c:403
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:484
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Vastaanottajat"
+msgid "C_ontaining:"
+msgstr "S_isältää:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Valitse nimet"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Kontaktit"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Select name from _folder:"
-msgstr "Valitse tiedosto"
+msgid "F_ind"
+msgstr "Etsi:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "_Category:"
-msgstr "Ryhmät:"
+msgid "Select Names"
+msgstr "Valitse nimet"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Etsi"
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "_Category:"
+msgstr "_Ryhmä:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr "_Kansio:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "Vastaanottajat"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -745,8 +715,8 @@ msgid "Business _Fax"
 msgstr "Työ-_faksi"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
 
@@ -755,7 +725,7 @@ msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -764,7 +734,7 @@ msgid "File As:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Yleiset"
 
@@ -777,9 +747,8 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#, fuzzy
 msgid "Organi_zation:"
-msgstr "Organisaatio:"
+msgstr "Organi_saatio:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
@@ -810,17 +779,16 @@ msgid "_Business"
 msgstr "_Työ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.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
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#: 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
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -872,115 +840,122 @@ msgstr "_Tämä on postitusosoite"
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:725
 msgid "This contact belongs to these categories:"
 msgstr "Tämä kontakti kuuluu näihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1539
+#: addressbook/gui/widgets/e-addressbook-view.c:809
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1540
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
 msgid "Business"
 msgstr "Työ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1541
 msgid "Business 2"
 msgstr "Työ 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1542
+#: addressbook/gui/widgets/e-addressbook-view.c:789
 msgid "Business Fax"
 msgstr "Työ/faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1543
 msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1544
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1545
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1546
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1547
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1548
+#: addressbook/gui/widgets/e-addressbook-view.c:790
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/widgets/e-addressbook-view.c:793
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1550
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1551
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1552
+#: addressbook/gui/widgets/e-addressbook-view.c:795
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1553
+#: addressbook/gui/widgets/e-addressbook-view.c:796
 msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1554
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1555
+#: addressbook/gui/widgets/e-addressbook-view.c:797
 msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1556
+#: addressbook/gui/widgets/e-addressbook-view.c:798
 msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1557
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalisäys"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:776
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "Sähköposti"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -1112,6 +1087,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
 #, fuzzy
 msgid "_Remove"
 msgstr "Poista"
@@ -1122,7 +1098,7 @@ msgid "contact-list-editor"
 msgstr "Kontaktinhallinta"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Kontaktinhallinta"
@@ -1171,7 +1147,12 @@ msgstr ""
 msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:242
+msgid "Advanced Search"
+msgstr "Edistynyt haku"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
 #: mail/mail-search.c:258
 msgid "Search"
 msgstr "Etsi"
@@ -1284,41 +1265,51 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: 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
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+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-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: 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"
 msgstr "Lähetä viesti kontaktille"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: 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-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
-#: ui/my-evolution.xml.h:2
+#: 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
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: 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
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Poista"
@@ -1336,7 +1327,8 @@ msgid "Success"
 msgstr "Lähteet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
+#: shell/e-storage.c:501
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -1345,7 +1337,7 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:495
 msgid "Permission denied"
 msgstr ""
 
@@ -1392,133 +1384,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:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1159
 #, fuzzy
 msgid "Error removing card"
 msgstr "Virhe %s:n lataamisessa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:774
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:775
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:777
 msgid "Email"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:778
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:779
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:780
 msgid "Business Phone"
 msgstr "Työpuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:781
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:782
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:783
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:784
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Business Address"
 msgstr "Työosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:786
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:787
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:788
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:791
 msgid "Business Phone 2"
 msgstr "Työpuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:792
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:794
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:799
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:803
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:806
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:811
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:812
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:813
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1156
 #, fuzzy
 msgid "Done."
 msgstr "Valmis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1188
 #, fuzzy
 msgid "Removing cards..."
 msgstr "Ladataan kalenteria..."
@@ -1710,6 +1702,23 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "Kirjasin..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "Tulosta kalenteri"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "Tulosta kalenteri"
+
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+#, fuzzy
+msgid "Print envelope"
+msgstr "Tulostuksen esikatselu"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1861,7 +1870,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobon alustus ei onnistunut"
@@ -1870,7 +1879,7 @@ msgstr "Bonobon alustus ei onnistunut"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:405
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %e %B %Y"
@@ -1878,7 +1887,7 @@ 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/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -1888,131 +1897,129 @@ msgstr "%a %d %b"
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:426
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:586
+#. 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/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
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Julkinen"
-
-#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Tuntematon"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+#: 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
 msgid "High"
 msgstr "Korkea"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1708
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+#: 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
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+#: 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
 msgid "Low"
 msgstr "Matala"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
-#: calendar/gui/e-calendar-table.c:383
-msgid "Transparent"
-msgstr ""
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "Pe"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: 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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2023,73 +2030,59 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:981
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"Luokittelun tulee olla 'Julkinen', 'Yksityinen, 'Luottamuksellinen', tai "
-"'Määrittelemätön'"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
-#: calendar/gui/calendar-model.c:1291
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
-#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
-#: shell/e-shell-view.c:1405 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
-msgid "None"
-msgstr "Määrittelemätön"
-
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
 "'Määrittelemätön'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr ""
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c: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
+msgid "None"
+msgstr "Määrittelemätön"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1279
 msgid "Yes"
 msgstr "Kyllä"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1280
 msgid "No"
 msgstr "Ei"
 
@@ -2113,6 +2106,33 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
+#: calendar/gui/cal-search-bar.c:55
+msgid "Summary contains"
+msgstr "Yhteenveto sisältää"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Description contains"
+msgstr "Kuvaus:"
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Comment contains"
+msgstr "Kommentti sisältää"
+
+#: calendar/gui/cal-search-bar.c:378
+msgid "Category:"
+msgstr "Ryhmät:"
+
+#. All, Unmatched, separator items
+#: calendar/gui/cal-search-bar.c:498
+msgid "All"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:503
+#, fuzzy
+msgid "Unfiled"
+msgstr "Nimetön"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri näyttää"
@@ -2257,6 +2277,17 @@ msgstr "Lähetä sähköpostia"
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
+#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: 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
+#: 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
 #, fuzzy
 msgid "before start of appointment"
@@ -2278,27 +2309,23 @@ msgid "after end of appointment"
 msgstr "Luo uusi tapaaminen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Päiväys & Aika"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-#: calendar/gui/dialogs/task-details-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
 msgid "Summary:"
 msgstr "Kuvaus:"
@@ -2308,12 +2335,11 @@ msgstr "Kuvaus:"
 msgid "_Options..."
 msgstr "_Asetukset"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "jälkeen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "ennen"
 
@@ -2330,7 +2356,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:113
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -2367,181 +2393,149 @@ msgid "60 minutes"
 msgstr "60 minuuttia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Kalenterin asetukset"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Compress weekends in month view"
 msgstr "Tiivistä viikonloput"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date Navigator"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "Oletukset"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: mail/mail-config.glade.h:26
 msgid "Display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: 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:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Overdue tasks"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "Muistuta minua kaikista tapaamisista"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "Näytä tapaamisten loppumisajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Show week numbers in date navigator"
 msgstr "Näytä viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Start of day:"
 msgstr "Päivän alku:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sun"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #, fuzzy
 msgid "Task List"
 msgstr "Tehtävät"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Tasks due today"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Tasks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Thu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Torstai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 #, fuzzy
 msgid "Time zone:"
 msgstr ""
 "\n"
 "Aikavyöhyke: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Tue"
 msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Work Week"
 msgstr "Työviikk_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "minuuttia niitä ennen."
-
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
@@ -2606,61 +2600,61 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2116
 msgid " to "
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Valmis"
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:454
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:459
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:462
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:465
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:479
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1490
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2669,12 +2663,12 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1063
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2720,6 +2714,21 @@ msgstr "Haluatko todella poistaa tehtävän '%s'?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#, fuzzy
+msgid "Addressbook..."
+msgstr "Osoitekirja"
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#, fuzzy
+msgid "Delegate To:"
+msgstr "Poistettu"
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
+msgid "Enter Delegate"
+msgstr "Poistettu"
+
 #: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
 #, fuzzy
 msgid "Select a Time Zone"
@@ -2744,20 +2753,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
@@ -2766,173 +2775,188 @@ msgstr "Peruuta tapaaminen"
 msgid "A_ll day event"
 msgstr "_Koko päivän kestävä tapahtuma"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Luottamuksellinen"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Päiväys & Aika"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "_Viikko"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Y_ksityinen"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "Näytä"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "K_uvaus:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Luottamuksellinen"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1247
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1248
 #, fuzzy
 msgid "Group"
 msgstr "Ryhmän nimi:"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1249
 #, fuzzy
 msgid "Resource"
 msgstr "Paperilähde:"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1250
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1263
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1181
+#: calendar/gui/dialogs/meeting-page.c:1264
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1265
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1266
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1189
+#: calendar/gui/dialogs/meeting-page.c:1292
 #, fuzzy
 msgid "Needs Action"
 msgstr "Lisää toiminto"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1293
 #, fuzzy
 msgid "Accepted"
 msgstr "Hyväksy "
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1294
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1295
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "Ammatti"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:838
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:958
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:838
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:916
 #, fuzzy
 msgid "Sent By:"
 msgstr "Lähetetyt"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1467
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -2973,19 +2997,18 @@ msgid "Role"
 msgstr "Rooli"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: mail/message-list.etspec.h:8
 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:102
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:83
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisoija:"
@@ -3033,9 +3056,10 @@ msgstr "."
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "Lisää"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3046,26 +3070,30 @@ msgid "Exceptions"
 msgstr "Poikkeukset"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
+msgid "_Custom recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "Muuta"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr ""
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -3107,165 +3135,158 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
-msgid "Delegated From:"
-msgstr "Poistettu"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "Valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "Poistettu"
+msgid "Date Completed:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "Määrittelemätön"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Tehtävä"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioriteetti:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "_Alkamispäivä:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Luottamuksellinen"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_Prioriteetti:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "_Tila:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
-#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#: 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
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: 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
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
-#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: 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
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
-#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
-#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: 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
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:862
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:864
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Poista tämä tehtävä"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:867
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:869
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista tehtävä"
 
-#: calendar/gui/e-calendar-table.c:1137
+#: calendar/gui/e-calendar-table.c:1129
 msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
-msgid "% Complete"
-msgstr "Valmis"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
@@ -3299,22 +3320,17 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:15
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
-#, fuzzy
-msgid "Task sort"
-msgstr "Tehtävät"
-
 #: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr "Läpinäkyvyys"
+msgid "Task sort"
+msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
@@ -3327,152 +3343,143 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3306
-#, fuzzy
+#: calendar/gui/e-day-view.c:3357
 msgid "New _Appointment"
-msgstr "Uusi tapaaminen"
+msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
-#, fuzzy
+#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
 msgid "New All Day _Event"
-msgstr "Uusi koko päivän tapahtuma"
+msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-#, fuzzy
+#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
 msgid "_Go to Date..."
-msgstr "Siirry päivään..."
+msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-#, fuzzy
+#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
 msgid "_Delete this Appointment"
-msgstr "Poista tämä tapaaminen"
+msgstr "P_oista tämä tapaaminen"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
-#, fuzzy
+#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
 msgid "Make this Occurrence _Movable"
-msgstr "Tallenna nykyinen tiedosto"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
-#, fuzzy
+#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
 msgid "Delete this _Occurrence"
-msgstr "Poista tämä viesti"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:697
 msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
-#, fuzzy
+#: calendar/gui/e-itip-control.c:700
 msgid "This is a meeting request."
-msgstr "_Tämä on postitusosoite"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:703
 msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:709
 msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:712
 msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
-#, fuzzy
+#: 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 "Tiedosto on olemassa, muttei lukukelpoinen."
+msgstr "Viesti ei ole ymmärrettävissä."
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:740
 msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:749
 msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:752
 msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:774
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:780
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:837
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:856
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:880
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:992
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1018
 msgid "I couldn't remove the item from your calendar file!\n"
-msgstr "En pystynyt avaamaan kalenteritiedostoasi!\n"
+msgstr "En pystynyt poistamaan kohtaa kalenteritiedostostasi!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -3511,44 +3518,26 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
-#: calendar/gui/e-tasks.c:629
-msgid "All"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:252
-msgid "Category:"
-msgstr "Ryhmät:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:230
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
-#, fuzzy
+#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
 msgid "New _Appointment..."
-msgstr "Uusi tapaaminen..."
+msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1248
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1259
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3574,43 +3563,42 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Siirry tähän päivään"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Tammikuu"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Heinäkuu"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Kesäkuu"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Maaliskuu"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Toukokuu"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Marraskuu"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Lokakuu"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "Siirry tähän päivään"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:228
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3766,8 +3754,8 @@ msgstr "Pe"
 msgid "Sa"
 msgstr "La"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
-#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: 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"
@@ -3805,22 +3793,21 @@ msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: 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
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
 #: calendar/gui/print.c:2317
-#, fuzzy
 msgid "Print Item"
-msgstr "Tulosta tämä kohta"
+msgstr "Tulosta kohta"
 
 #: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3856,6 +3843,98 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+
+#: calendar/pcs/query.c:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:967
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr ""
+
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
@@ -3917,9 +3996,9 @@ msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d%%)"
 
 #: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
-#, fuzzy, c-format
+#, c-format
 msgid "Failed on message %d"
-msgstr "Välitetty viesti - %s"
+msgstr "Virhe viestin %d kohdalla"
 
 #: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
@@ -3937,7 +4016,7 @@ msgstr "Haetaan viestiä %d / %d"
 #: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr ""
+msgstr "Virhe viestin %d/%d kohdalla"
 
 #: camel/camel-filter-driver.c:892
 #, c-format
@@ -3949,7 +4028,7 @@ msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3972,19 +4051,19 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
 #: camel/camel-lock-client.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Putken luonti epäonnistui: %s"
+msgstr ""
 
 #: camel/camel-lock-client.c:123
 #, c-format
@@ -3997,9 +4076,9 @@ msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
 #: camel/camel-lock-client.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "Could not lock '%s'"
-msgstr "Haaroitus epäonnistui: %s"
+msgstr "Lukitus epäonnistui: %s"
 
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
@@ -4091,13 +4170,13 @@ msgid "No plaintext to sign."
 msgstr ""
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "Ei annettu salasanaa."
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
-#: camel/camel-pgp-context.c:1295
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle epäonnistui: %s"
@@ -4115,15 +4194,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "Ei puhdasta tekstiä salattavaksi."
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "Vastaanottajia ei ole määritelty"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -4170,7 +4249,7 @@ msgstr ""
 
 #: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
 #: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:382
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
@@ -4287,6 +4366,33 @@ msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttäen."
 msgid "Unknown authentication state."
 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
+msgid "Password"
+msgstr "Salasana"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "Lähde"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -4335,12 +4441,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4359,29 +4465,28 @@ msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
 #: camel/camel-smime-context.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "The signature certificate for \"%s\" does not exist."
-msgstr "Tiedostoa ei ole olemassa."
+msgstr ""
 
 #: camel/camel-smime-context.c:249
-#, fuzzy, c-format
+#, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
-msgstr "Tiedostoa ei ole olemassa."
+msgstr ""
 
 #: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
 #: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to find certificate for \"%s\"."
-msgstr "Käyttäjätunnuksen lähetys palvelimelle epäonnistui"
+msgstr ""
 
 #: camel/camel-smime-context.c:545
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
 #: camel/camel-smime-context.c:799
-#, fuzzy
 msgid "Failed to decode message."
-msgstr "Lisää viestiin liitetiedoston"
+msgstr "Viestin salauksen purkaminen epäonnistui."
 
 #: camel/camel-smime-context.c:844
 msgid "Failed to verify certificates."
@@ -4436,66 +4541,64 @@ msgstr "Ei kyseistä viestiä: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Et voi kopioida viestejä tästä roskakorista."
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
-#, fuzzy
+#: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
-msgstr "Tallennetaan viestejä"
+msgstr "Etsitään muuttuneita viestejä"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1478
+#: camel/providers/imap/camel-imap-folder.c:1902
 msgid "This message is not currently available"
-msgstr ""
+msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1620
+#: camel/providers/imap/camel-imap-folder.c:1701
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
-#, fuzzy
+#: camel/providers/imap/camel-imap-folder.c:1626
 msgid "Scanning for new messages"
-msgstr "Tallennetaan viestejä"
+msgstr "Etsitään uusia viestejä"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1935
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4504,7 +4607,7 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "Välimuistihakemistoa ei voitu avata: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
@@ -4512,7 +4615,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:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:653
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -4550,7 +4653,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:368
+#: camel/providers/smtp/camel-smtp-transport.c:387
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -4561,7 +4664,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:412
+#: camel/providers/smtp/camel-smtp-transport.c:431
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
@@ -4573,12 +4676,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:327
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1023
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4668,7 +4771,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4680,7 +4783,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4731,9 +4834,9 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr "Kansion `%s' poistaminen epäonnistui: %s"
+msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
@@ -4747,20 +4850,20 @@ msgstr ""
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:338
-#: camel/providers/local/camel-mbox-folder.c:370
-#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4772,12 +4875,12 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s epäonnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
@@ -4843,7 +4946,7 @@ msgstr ""
 #: 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:1516
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1549
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
@@ -4924,30 +5027,28 @@ msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-spool-folder.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
-"Viestin %s hakeminen kansiosta %s epäonnistui\n"
-"  %s"
 
 #: camel/providers/local/camel-spool-store.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' ei ole tavallinen tiedosto."
+msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:159
-#, fuzzy, c-format
+#, c-format
 msgid "Folder `%s/%s' does not exist."
-msgstr "Kansiota `%s' ei ole olemassa."
+msgstr "Kansiota `%s/%s' ei ole olemassa."
 
 #: camel/providers/local/camel-spool-store.c:176
 msgid "Spool stores do not have an inbox"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "Spool mail file %s"
-msgstr "Paikallinen viestitiedosto %s"
+msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:222
 msgid "Spool folders cannot be renamed"
@@ -4960,14 +5061,14 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
 
 #: camel/providers/local/camel-spool-summary.c:817
-#, fuzzy, c-format
+#, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr "Kansion `%s' poistaminen epäonnistui: %s"
+msgstr ""
 
 #: camel/providers/local/camel-spool-summary.c:847
 #: camel/providers/local/camel-spool-summary.c:865
@@ -5045,39 +5146,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:193
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:199
 #, 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:199
+#: camel/providers/pop3/camel-pop3-folder.c:239
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Haetaan POP-viestiä %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:332
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Viestin hakeminen epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:348
 #, 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
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:375
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Haetaan POP-viestiä %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr ""
@@ -5091,7 +5192,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:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -5170,7 +5271,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:70
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5222,7 +5323,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:63
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5335,17 +5436,17 @@ msgstr "Todennus vaaditaan"
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:377
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:416
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:439
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5353,126 +5454,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:555
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:557
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:582
 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:570
+#: camel/providers/smtp/camel-smtp-transport.c:589
 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:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:605
 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:666
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:727
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
+#: camel/providers/smtp/camel-smtp-transport.c:759
+msgid "SMTP Authentication"
+msgstr "SMTP-todennus"
+
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
-#, fuzzy
-msgid "SMTP Authentication"
-msgstr "Todennus"
-
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:780
+#: camel/providers/smtp/camel-smtp-transport.c:792
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:801
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:875
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:894
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:919
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:938
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:969
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:988
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
 #: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1085
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1127
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5535,52 +5635,52 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5593,90 +5693,93 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer.c:670
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:687
+#, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
-msgstr "Kansion `%s' poistaminen epäonnistui: %s"
+msgstr ""
+"Tiedoston %s poistaminen epäonnistui:\n"
+"%s"
 
-#: composer/e-msg-composer.c:683
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:700
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
-msgstr "Virhe avattaessa tiedostoa: %s"
+msgstr ""
+"Tiedoston %s lukeminen epäonnistui:\n"
+"%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:890
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: composer/e-msg-composer.c:882
-#, fuzzy
+#: composer/e-msg-composer.c:899
 msgid "Warning!"
-msgstr "Varoitus"
+msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:901
 msgid "File exists, overwrite?"
-msgstr ""
+msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:923
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:943
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:1014
 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:1047
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:1064
+#, c-format
 msgid "Error accessing file: %s"
-msgstr "Virhe tallennettaessa tiedostoa: %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:1055
-#, fuzzy
+#: composer/e-msg-composer.c:1072
 msgid "Unable to retrieve message from editor"
-msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:1061
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:1078
+#, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
-msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:1067
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:1084
+#, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
-msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:1076
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:1093
+#, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
-msgstr "Virhe tallennettaessa tiedostoa: %s"
+msgstr ""
+"Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:1173
-#, fuzzy
+#: composer/e-msg-composer.c:1193
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
-"Evolution on löytänyt Elmin sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä postit Evolutioniin?"
+"Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
+"istunnolta. Haluatko koittaa palauttaa niitä?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1341
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5686,27 +5789,26 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:215
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1371
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1500
-#, fuzzy
+#: composer/e-msg-composer.c:1520
 msgid "Insert File"
-msgstr "Liitä tekstitiedosto..."
+msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2384
 msgid "Could not create composer window."
-msgstr ""
+msgstr "Viestin kirjoitusikkunan luominen epäonnistui."
 
 #: composer/evolution-composer.c:359
 msgid ""
@@ -5765,19 +5867,17 @@ msgid "%H:%M"
 msgstr "%H:%M"
 
 #: e-util/e-time-utils.c:240
-#, fuzzy
 msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
+msgstr ""
 
 #: e-util/e-time-utils.c:241
-#, fuzzy
 msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
+msgstr ""
 
 #: e-util/e-time-utils.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "%x"
-msgstr "x"
+msgstr ""
 
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:298
@@ -5919,20 +6019,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:796
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:197
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5951,42 +6051,39 @@ msgstr "Säännön nimi: "
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "mikään ehdoista täyttyy"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Lisää ehto"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "lähtevät"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
+#: filter/filter.glade.h:1
 msgid "Add"
 msgstr "Lisää"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+#: filter/filter.glade.h:3
 msgid "Edit"
 msgstr "Muokkaa"
 
@@ -6030,192 +6127,192 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisältää"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Poistettu"
 
+#: filter/libfilter-i18n.h:10
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+msgid "Draft"
+msgstr "Luonnos"
+
+#: filter/libfilter-i18n.h:12
+msgid "Exist"
+msgstr ""
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisällä"
+msgid "Expression"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
+msgid "Important"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemassa"
+msgid "Mailing list"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not sound like"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
+msgid "Message Header"
+msgstr "Viestin otsikko"
 
 #: filter/libfilter-i18n.h:18
-msgid "Do Not Exist"
-msgstr ""
+msgid "Message was received"
+msgstr "Viesti vastaanotettu"
 
 #: filter/libfilter-i18n.h:19
-msgid "Draft"
-msgstr "Luonnos"
+msgid "Message was sent"
+msgstr "Viesti lähetetty"
 
 #: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
+msgid "Move to Folder"
+msgstr "Siirrä kansioon"
 
 #: filter/libfilter-i18n.h:21
-msgid "Exist"
-msgstr ""
+msgid "Read"
+msgstr "Lue"
 
 #: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr ""
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:23
-msgid "Expression"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Important"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "on"
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "on suurempi kuin"
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+msgid "Sender"
+msgstr "Lähettäjä"
 
 #: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "on pienempi kuin"
+msgid "Set Status"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "ei ole"
+msgid "Size (kB)"
+msgstr "Koko (kt)"
 
 #: filter/libfilter-i18n.h:29
-msgid "Mailing list"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Message Body"
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
-msgid "Message Header"
-msgstr "Viestin otsikko"
-
 #: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "Viesti vastaanotettu"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "Viesti lähetetty"
-
-#: filter/libfilter-i18n.h:34
-msgid "Move to Folder"
-msgstr "Siirrä kansioon"
-
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
+msgid "Stop Processing"
 msgstr ""
 
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Aihe"
+
 #: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr ""
+msgid "contains"
+msgstr "sisältää"
 
 #: filter/libfilter-i18n.h:37
-msgid "Read"
-msgstr "Lue"
+msgid "does not contain"
+msgstr "ei sisällä"
 
 #: filter/libfilter-i18n.h:38
-msgid "Recipients"
-msgstr "Vastaanottajat"
+msgid "does not end with"
+msgstr "ei lopu merkkijonoon"
 
 #: filter/libfilter-i18n.h:39
-msgid "Regex Match"
-msgstr ""
+msgid "does not exist"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:40
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
-msgstr ""
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "ei ala merkkijonolla"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
-msgid "Sender"
-msgstr "Lähettäjä"
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "loppuu merkkijonoon"
 
 #: filter/libfilter-i18n.h:43
-msgid "Set Status"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Size (kB)"
-msgstr "Koko"
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr ""
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:46
-msgid "Source Account"
-msgstr ""
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:47
-msgid "Specific header"
-msgstr ""
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "alkaa merkkijonolla"
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "Stop Processing"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Aihe"
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "alkaa merkkijonolla"
 
 #: filter/libfilter-i18n.h:52
 msgid "was after"
@@ -6250,57 +6347,56 @@ msgstr ""
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
-msgstr ""
+msgstr "Tuo"
 
 #: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
-#, fuzzy
+#: importers/pine-importer.c:632
 msgid "Mail"
-msgstr "Sähköposti"
+msgstr ""
 
 #: importers/elm-importer.c:498
-#, fuzzy
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution on löytänyt Elmin sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä postit Evolutioniin?"
+"Evolution löysi Elmin sähköpostitiedostoja.\n"
+"Haluatko tuoda nämä Evolutioniin?"
 
 #: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm-sähköposti"
 
 #: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
-#, fuzzy
 msgid "Addressbook"
-msgstr "Lisää osoitekirja"
+msgstr "Osoitekirja"
 
 #: importers/evolution-gnomecard-importer.c:253
-#, fuzzy
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution on löytänyt Elmin sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä postit Evolutioniin?"
+"Evolution löysi GnomeCardin tiedostoja.\n"
+"Haluatko tuoda nämä Evolutioniin?"
 
 #: importers/netscape-importer.c:824
-#, fuzzy
 msgid "Settings"
-msgstr "Asetukset..."
+msgstr "Asetukset"
 
 #: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
+"Evolution löysi Netscapen sähköpostitiedostoja.\n"
+"Haluatko tuoda nämä Evolutioniin?"
 
 #: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
+"Evolution löysi Pinen sähköpostitiedostoja.\n"
+"Haluatko tuoda nämä Evolutioniin?"
 
 #: importers/pine-importer.c:691
 msgid "Pine mail"
@@ -6344,166 +6440,168 @@ msgstr ""
 
 #: mail/component-factory.c:111
 msgid "This folder cannot contain messages."
-msgstr ""
+msgstr "Tämä kansio ei voi sisältää viestejä."
 
 #: mail/component-factory.c:337
-#, fuzzy
 msgid "Properties..."
-msgstr "_Ominaisuudet..."
+msgstr "Ominaisuudet..."
 
 #: mail/component-factory.c:337
 msgid "Change this folder's properties"
-msgstr ""
+msgstr "Muuta tämän kansion ominaisuuksia"
 
 #: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
-msgstr ""
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
 
 #: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:256
 #, c-format
 msgid "Properties for \"%s\""
-msgstr ""
+msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:258
 msgid "Properties"
-msgstr ""
+msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:232 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:893
-msgid "Store search as vFolder"
-msgstr ""
+#: mail/folder-browser.c:900
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "_Luo viestistä suodatin"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1245
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1248
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1251
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1254
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1260
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1263
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1266
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1269
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
+#: mail/folder-browser.c:1280
+#, fuzzy
+msgid "R_esend..."
 msgstr "Lähetä uudelleen"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
 #: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1284 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
-#, fuzzy
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
-msgstr "Vastaa _kaikille"
+msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
-msgstr "Vastaa _kaikille"
+msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1295
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1295
-#, fuzzy
+#: mail/folder-browser.c:1302
 msgid "Mark as _Important"
-msgstr "Merkitse luke_mattomaksi"
+msgstr "Merkitse tärkeäks_i"
 
-#: mail/folder-browser.c:1297
-#, fuzzy
+#: mail/folder-browser.c:1304
 msgid "Mark as Unim_portant"
-msgstr "Merkitse luke_mattomaksi"
+msgstr ""
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1309
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1311
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1313
-#, fuzzy
+#: mail/folder-browser.c:1320
 msgid "Add Sender to Address Book"
-msgstr "Lisää osoitekirja"
+msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1325
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1329
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1487
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1488
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1490
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1491
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-info.c:60
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "Valinnaiset tiedot"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
@@ -6557,28 +6655,25 @@ msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
 #. give our dialog an OK button and title
 #: mail/mail-account-editor-news.c:160
-#, fuzzy
 msgid "Evolution News Editor"
-msgstr "Evolutionin tilimuokkain"
+msgstr "Evolutionin uutismuokkain"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:162
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:971
-#, fuzzy
+#: mail/mail-account-gui.c:986
 msgid "Save signature"
-msgstr "Allekirjoitustiedosto:"
+msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-account-gui.c:977
-#, fuzzy
+#: mail/mail-account-gui.c:992
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"Tätä viestiä ei ole lähetetty.\n"
+"Tätä allekirjoitusta on muutettu, mutta sitä ei ole tallennettu.\n"
 "\n"
 "Haluatko tallentaa muutokset?"
 
@@ -6590,7 +6685,7 @@ msgstr " (oletus)"
 msgid "Disable"
 msgstr "Älä käytä"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:176
 msgid "Enable"
 msgstr "Käytä"
 
@@ -6599,21 +6694,19 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
 #: mail/mail-accounts.c:268
-#, fuzzy
 msgid "Don't delete"
-msgstr "Palauta"
+msgstr "Älä poista"
 
 #: mail/mail-accounts.c:271
-#, fuzzy
 msgid "Really delete account?"
-msgstr "Tämä on oletustilini"
+msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:495 mail/mail-accounts.c:499
 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:742
+#: mail/mail-accounts.c:741
 msgid "Evolution Account Manager"
 msgstr "Evolutionin tilienhallinta"
 
@@ -6641,7 +6734,7 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6653,23 +6746,23 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestejä.\n"
 "Haluatko tehdä asetukset nyt?"
 
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:184
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:217
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6677,7 +6770,7 @@ msgstr ""
 "Viestillä ei ole aihetta.\n"
 "Lähetetäänkö toedella?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:252
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6685,38 +6778,38 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:338
 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:410
+#: mail/mail-callbacks.c:389
 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:653
+#: mail/mail-callbacks.c:632
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s %s kirjoitti:"
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:893
 msgid "Forwarded message:\n"
 msgstr "Välitetty viesti:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:990
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:992
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1361
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1383
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6724,7 +6817,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1417
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6732,44 +6825,43 @@ msgstr ""
 "Voit lähettää uudelleen vain\n"
 "\"Lähetetyt\"-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:1442
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:1429
+#, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
+msgstr "Haluatko todella lähettää kaikki %d viestiä uudelleen?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1450
 msgid "No Message Selected"
 msgstr "Ei viestejä valittuna"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1534
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellä..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1536
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellä..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1759
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1776
-#, fuzzy
+#: mail/mail-callbacks.c:1769
 msgid "Filters"
-msgstr "S_uodattimet..."
+msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1815
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1861
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:1945
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -6805,80 +6897,75 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:466
+#: mail/mail-config-druid.c:463
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#: mail/mail-config.c:1570
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1641 mail/mail-config.c:1644
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr " Tarkista tuetut tavat "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Tilit"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "Tarkasta onko uutta postia joka"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
-#, fuzzy
+#: mail/mail-config.glade.h:15
 msgid "Composer"
-msgstr "Kirjoita"
+msgstr "Muokkain"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6888,298 +6975,336 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
+msgstr "Kä_ytä"
+
+#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Sähköpostiosoite:"
-
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:39
-#, fuzzy
+#: mail/mail-config.glade.h:32
 msgid "Enabled"
 msgstr "Käytä"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Koko nimi:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:33
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "HTML Signature:"
-msgstr "Allekirjoitustiedosto:"
+#: mail/mail-config.glade.h:34
+msgid "HTML signature file:"
+msgstr "HTML-allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:43
-#, fuzzy
-msgid "Highlight citations with"
-msgstr "Korosta lainaukset värillä "
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:35
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:36
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:37
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:38
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:39
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:41
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr "Tämä on oletustilini"
-
-#: mail/mail-config.glade.h:54
-#, fuzzy
-msgid "Mark messages as Read after"
-msgstr "Merkitse viestit luetuiksi kun on kulunut:"
+#: mail/mail-config.glade.h:42
+msgid "Make this my _default account"
+msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
-msgstr ""
+#: mail/mail-config.glade.h:43
+msgid "Message _preview should be displayed by default"
+msgstr "Viestin _esikatselu on käytössä oletuksena"
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:44
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
-#, fuzzy
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
-msgstr "LDAP-palvelin"
-
-#: mail/mail-config.glade.h:59
-msgid "Never load images off the net"
-msgstr ""
+msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:46
 msgid "News"
-msgstr ""
+msgstr "Uutiset"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "Organisaatio:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:50
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "PGP-ohjelman polku:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Prompt when sending messages with an empty subject"
+#: mail/mail-config.glade.h:55
+msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
-#, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+#: mail/mail-config.glade.h:56
+msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:57
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:58
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:59
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sähköpostia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:60
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:61
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:62
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:64
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
-#, fuzzy
+#: mail/mail-config.glade.h:65
 msgid "Security"
-msgstr "Turvalli_suus"
+msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:66
+msgid "Select Filter Log file..."
+msgstr ""
+
+#: mail/mail-config.glade.h:67
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "Lähetä sähköpostit oletuksena HTML-muodossa."
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:68
 msgid "Sending Email"
 msgstr "Lähetetään sähköpostia"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:69
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:71 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Lähetetyt"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:72
 msgid "Sent and Draft Messages"
 msgstr "Lähetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:73
 msgid "Sent messages folder:"
 msgstr "Lähetettyjen kansio:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:74
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:75
 msgid "Server Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
-msgstr "Palvelin vaati todennuksen"
+#: mail/mail-config.glade.h:76
+msgid "Server requires _authentication"
+msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:77
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:97
-#, fuzzy
+#: mail/mail-config.glade.h:78
 msgid "Source"
-msgstr "Lähteet"
+msgstr "Lähde"
 
-#: mail/mail-config.glade.h:98
-#, fuzzy
+#: mail/mail-config.glade.h:79
 msgid "Source Information"
-msgstr "Pakolliset tiedot"
+msgstr "Lähteen tiedot"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:80
 msgid "Sources"
 msgstr "Lähteet"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:81
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:82
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
-msgstr "Käytä salattua yhteyttä (SSL)"
-
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "Käyttäjätunnus:"
+#: mail/mail-config.glade.h:84
+msgid "Use secure connection (_SSL)"
+msgstr "Käytä salattua yhteyttä (_SSL)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:85
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
+#: mail/mail-config.glade.h:89
+msgid "_Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:90
+msgid "_Automatically check for new mail every"
+msgstr "T_arkasta onko uutta postia joka"
+
+#: mail/mail-config.glade.h:91
+msgid "_Check for supported types"
+msgstr "Tar_kista tuetut tavat"
+
+#: mail/mail-config.glade.h:94
+msgid "_Email Address:"
+msgstr "Sähköpostiosoit_e:"
+
+#: mail/mail-config.glade.h:95
+msgid "_Empty trash folders on exit"
+msgstr "Tyhj_ennä roskakorit lopetettaessa"
+
+#: mail/mail-config.glade.h:96
+msgid "_Full Name:"
+msgstr "_Koko nimi:"
+
+#: mail/mail-config.glade.h:97
+msgid "_HTML Signature:"
+msgstr "_HTML-allekirjoitus:"
+
+#: mail/mail-config.glade.h:98
+msgid "_Highlight citations with"
+msgstr "_Korosta lainaukset värillä"
+
+#: mail/mail-config.glade.h:99
+msgid "_Host:"
+msgstr "_Isäntäpalvelin:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:102
+msgid "_Mark messages as Read after"
+msgstr "_Merkitse viestit luetuiksi kun on kulunut"
+
+#: mail/mail-config.glade.h:103
+msgid "_Name:"
+msgstr "_Nimi:"
+
+#: mail/mail-config.glade.h:104
+msgid "_Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:105
+msgid "_Organization:"
+msgstr "_Organisaatio:"
+
+#: mail/mail-config.glade.h:106
+msgid "_PGP binary path:"
+msgstr "_PGP-ohjelman polku:"
+
+#: mail/mail-config.glade.h:107
+msgid "_Path:"
+msgstr "_Polku:"
+
+#: mail/mail-config.glade.h:108
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "_Remember this password"
+msgstr "_Muista tämä salasana"
+
+#: mail/mail-config.glade.h:110
+msgid "_Send mail in HTML format by default."
+msgstr "Lähetä sähköpostit oletuksena _HTML-muodossa."
+
+#: mail/mail-config.glade.h:111
+msgid "_Signature file:"
+msgstr "Allekirjoitu_stiedosto:"
+
 #: mail/mail-config.glade.h:112
+msgid "_Username:"
+msgstr "Käyttäjät_unnus:"
+
+#: mail/mail-config.glade.h:114
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "seconds."
 msgstr "sekuntia."
 
 #: mail/mail-crypto.c:60
-#, fuzzy
 msgid "Could not create a PGP signature context."
-msgstr "Putken luonti epäonnistui: %s"
+msgstr ""
 
 #: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
@@ -7190,11 +7315,8 @@ msgid "Could not create a PGP encryption context."
 msgstr ""
 
 #: mail/mail-crypto.c:142
-#, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr ""
-"Hakemistoa %s ei voitu luoda:\n"
-"%s"
 
 #: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
@@ -7251,170 +7373,162 @@ msgid "Loading message content"
 msgstr "Ladataan viestin sisältöä"
 
 #: mail/mail-display.c:1404
-#, fuzzy
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
 #: mail/mail-display.c:1406
-#, fuzzy
 msgid "Copy Link Location"
-msgstr "Kopioi sijainti"
+msgstr "Kopioi linkin sijainti"
 
 #: mail/mail-display.c:1408
-#, fuzzy
 msgid "Save Link as (FIXME)"
-msgstr "Tallenna nimellä"
+msgstr "Tallenna linkki nimellä"
 
 #: mail/mail-display.c:1410
-#, fuzzy
 msgid "Save Image as..."
-msgstr "Tallenna nimellä..."
+msgstr "Tallenna kuva nimellä..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:146
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:153
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
-#, fuzzy, c-format
+#: mail/mail-folder-cache.c:162
+#, c-format
 msgid "%d unsent"
-msgstr " %d sekuntia"
+msgstr "%d lähettämätöntä"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:164
 #, c-format
 msgid "%d total"
-msgstr ""
+msgstr "%d yhteensä"
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Päiväys"
 
-#: mail/mail-format.c:842
-#, fuzzy
+#: mail/mail-format.c:856
 msgid "Bad Address"
-msgstr "Sähköpostiosoite:"
+msgstr "Epäkelpo osoite"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Lähettäjä"
 
-#: mail/mail-format.c:867
-#, fuzzy
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:873
-#, fuzzy
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
-msgstr ""
+msgstr "Salattua viestiä ei näytetä"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
+#: mail/mail-local.c:459
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:749
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:870
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1000
-#, fuzzy
+#: mail/mail-local.c:1002
 msgid "You cannot change the format of a non-local folder."
-msgstr "Et voi kopioida viestejä tästä roskakorista."
+msgstr "Et voi muuttaa ei-paikallisen kansion tyyppiä."
 
-#: mail/mail-local.c:1011
-#, fuzzy, c-format
+#: mail/mail-local.c:1013
+#, c-format
 msgid "Reconfigure %s"
-msgstr "Aseta %s"
+msgstr ""
 
 #: mail/mail-mt.c:187
 #, c-format
@@ -7430,158 +7544,170 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Muista tämä salasana"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+msgid "Filtering Folder"
+msgstr ""
+
+#: mail/mail-ops.c:227
+msgid "Fetching Mail"
+msgstr ""
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Siirretään"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
 msgid "Trash"
 msgstr "Roskakori"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1436
-#, fuzzy, c-format
+#: mail/mail-ops.c:1460
+#, c-format
 msgid "Removing folder %s"
-msgstr "Muistutukset"
+msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1568
-#, fuzzy
+#: mail/mail-ops.c:1599
 msgid "Refreshing folder"
-msgstr "Luodaan uutta kansiota"
+msgstr ""
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1635
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1684
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1722
-#, fuzzy, c-format
+#: mail/mail-ops.c:1751
+#, c-format
 msgid "Retrieving %d message(s)"
-msgstr "Haetaan viestejä"
+msgstr "Haetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1808
-#, fuzzy, c-format
+#: mail/mail-ops.c:1837
+#, c-format
 msgid "Saving %d messsage(s)"
-msgstr "Tallennetaan viestejä"
+msgstr "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1943
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2017
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2033
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2062
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2131
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Etsi"
+
 #: mail/mail-search.c:138
-#, fuzzy
 msgid "(Untitled Message)"
-msgstr "Etsi viestiä jolla ei ole aihetta"
+msgstr "(Nimetön viesti)"
 
 #: mail/mail-search.c:235
-#, fuzzy
 msgid "Untitled Message"
-msgstr "Etsi viestiä jolla ei ole aihetta"
+msgstr "Nimetön viesti"
 
 #: mail/mail-search.c:239
-#, fuzzy
 msgid "Empty Message"
-msgstr "Muokkaa viestiä"
+msgstr "Tyhjä viesti"
 
 #: mail/mail-search.c:284
-#, fuzzy
 msgid "Find in Message"
-msgstr "Muokkaa viestiä"
+msgstr "Hae viestistä"
 
 #: mail/mail-search.c:314
 msgid "Case Sensitive"
@@ -7596,39 +7722,30 @@ msgid "Find:"
 msgstr "Etsi:"
 
 #: mail/mail-search.c:335
-#, fuzzy
 msgid "Matches:"
-msgstr "Polku:"
+msgstr "Osumia:"
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Lähetä & Vastaanota postia"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "Otetaan vastaan"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "Lähetetään"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:507
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr ""
 
@@ -7643,87 +7760,97 @@ msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
 #: mail/mail-tools.c:245
-#, fuzzy
 msgid "Forwarded message"
-msgstr "Välitetyt viestit"
+msgstr "Välitetty viesti"
 
 #: mail/mail-tools.c:469
-#, fuzzy
 msgid "Forwarded Message"
-msgstr "Välitetyt viestit"
+msgstr "Välitetty viesti"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:282
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:502
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+msgid "(No subject)"
+msgstr "(Ei aihetta)"
+
+#: mail/message-browser.c:127
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Viesti"
+
+#: mail/message-list.c:629
 msgid "Unseen"
 msgstr "Nähty"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:630
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:631
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:632
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:633
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:637
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:638
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:642
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:643
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:893
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:900
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:909
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:921
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:929
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:931
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2290
-#, fuzzy
+#: mail/message-list.c:2312
+msgid "Generating message list"
+msgstr "Luodaan viestiluetteloa"
+
+#: mail/message-list.c:2324
 msgid "Updating message list"
-msgstr "Tallennetaan viestejä"
+msgstr "Päivitetään viestiluetteloa"
 
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
@@ -7737,37 +7864,38 @@ msgstr "Otettu vastaan"
 msgid "Size"
 msgstr "Koko"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Kansio"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr ""
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
+#: mail/subscribe-dialog.c:166
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
 #: mail/subscribe-dialog.c:168
 #, c-format
-msgid "Getting store for \"%s\""
+msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:267
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:269
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
-msgid "Manage Subscriptions"
-msgstr ""
+#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Kansio"
+
+#: mail/subscribe-dialog.c:1432
+msgid "No server has been selected"
+msgstr "Ei palvelinta valittuna"
+
+#: mail/subscribe-dialog.c:1489
+msgid "Please select a server."
+msgstr "Valitse palvelin."
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
@@ -7781,29 +7909,25 @@ msgstr ""
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:177
-#, fuzzy
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
-msgstr "Näytä tapaamiset"
+msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:226
-#, fuzzy
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
-msgstr "%I:%M%p"
+msgstr ""
 
-#: my-evolution/e-summary-calendar.c:228
-#, fuzzy
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
-msgstr "%a %l:%M %p"
+msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:104
-#, fuzzy
+#: my-evolution/e-summary-mail.c:105
 msgid "Mail summary"
-msgstr "Ei kuvausta"
+msgstr "Postin yhteenveto"
 
 #: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
@@ -7821,57 +7945,53 @@ msgstr ""
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
-#, fuzzy
+#: my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nimi:"
+
+#: my-evolution/e-summary-preferences.c:1403
 msgid "My Evolution Settings"
-msgstr "%s - Evolution %s"
+msgstr "Evolutionin aseukseni"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
 msgstr ""
 
 #: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-#, fuzzy
 msgid "<b>Error downloading RDF</b>"
-msgstr "<b>Virhe ladattaessa kalenteria</b>"
+msgstr "<b>Virhe ladattaessa RDF:ää</b>"
 
-#: my-evolution/e-summary-tasks.c:206
-#, fuzzy
+#: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
-msgstr "Näytä tehtävät"
+msgstr "Ei tehtäviä"
 
 #: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
-msgstr ""
+msgstr "Säätiedot"
 
 #: my-evolution/e-summary-weather.c:313
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr ""
+msgstr "<dd><b>Säätietopalvelimeen ei saatu yhteyttä</b></dd>"
 
 #: my-evolution/e-summary-weather.c:643
-#, fuzzy
 msgid "Regions"
-msgstr "Muistutukset"
+msgstr "Alueet"
 
 #: my-evolution/e-summary.c:145
-#, fuzzy
 msgid "%A, %d %B %Y"
-msgstr "%A, %e %B %Y"
+msgstr ""
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-#, fuzzy
 msgid "Print My Evolution"
-msgstr "Evolution"
+msgstr ""
 
 #: my-evolution/e-summary.c:518
-#, fuzzy
 msgid "Printing of My Evolution failed"
-msgstr "Viestin tulostus epäonnistui"
+msgstr ""
 
 #: my-evolution/main.c:52
-#, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "init_bonobo(): Bonobon alustus epäonnistui"
+msgstr ""
 
 #: my-evolution/metar.c:44
 msgid "Clear sky"
@@ -7898,14 +8018,12 @@ msgid "Invalid"
 msgstr ""
 
 #: my-evolution/metar.c:63
-#, fuzzy
 msgid "Variable"
-msgstr "Älä käytä"
+msgstr ""
 
 #: my-evolution/metar.c:64
-#, fuzzy
 msgid "North"
-msgstr "Portti:"
+msgstr ""
 
 #: my-evolution/metar.c:64
 msgid "North - NorthEast"
@@ -7920,54 +8038,48 @@ msgid "East - NorthEast"
 msgstr ""
 
 #: my-evolution/metar.c:65
-#, fuzzy
 msgid "East"
-msgstr "Liitä"
+msgstr ""
 
 #: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr ""
 
 #: my-evolution/metar.c:65
-#, fuzzy
 msgid "Southeast"
-msgstr "Lähteet"
+msgstr ""
 
 #: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr ""
 
 #: my-evolution/metar.c:66
-#, fuzzy
 msgid "South"
-msgstr "kuukausi"
+msgstr ""
 
 #: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr ""
 
 #: my-evolution/metar.c:66
-#, fuzzy
 msgid "Southwest"
-msgstr "Matalin"
+msgstr ""
 
 #: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr ""
 
 #: my-evolution/metar.c:67
-#, fuzzy
 msgid "West"
-msgstr "Ke"
+msgstr ""
 
 #: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr ""
 
 #: my-evolution/metar.c:67
-#, fuzzy
 msgid "Northwest"
-msgstr "Matalin"
+msgstr ""
 
 #: my-evolution/metar.c:67
 msgid "North - Northwest"
@@ -8018,9 +8130,8 @@ msgid "Windy drizzle"
 msgstr ""
 
 #: my-evolution/metar.c:100
-#, fuzzy
 msgid "Showers"
-msgstr "Näytä"
+msgstr ""
 
 #: my-evolution/metar.c:100
 msgid "Drifting drizzle"
@@ -8072,20 +8183,17 @@ msgid "Rain showers"
 msgstr ""
 
 #: my-evolution/metar.c:101
-#, fuzzy
 msgid "Drifting rain"
-msgstr "Kuvaus sisältää"
+msgstr ""
 
 #: my-evolution/metar.c:101
-#, fuzzy
 msgid "Freezing rain"
-msgstr "Etsi uudelleen"
+msgstr ""
 
 #. SNOW
 #: my-evolution/metar.c:102
-#, fuzzy
 msgid "Snow"
-msgstr "nyt"
+msgstr ""
 
 #: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
@@ -8096,9 +8204,8 @@ msgid "Light snow"
 msgstr ""
 
 #: my-evolution/metar.c:102
-#, fuzzy
 msgid "Moderate snow"
-msgstr "Päivitä heti"
+msgstr ""
 
 #: my-evolution/metar.c:102
 msgid "Heavy snow"
@@ -8178,9 +8285,8 @@ msgid "Snow grain showers"
 msgstr ""
 
 #: my-evolution/metar.c:103
-#, fuzzy
 msgid "Drifting snow grains"
-msgstr "Kuvaus sisältää"
+msgstr ""
 
 #: my-evolution/metar.c:103
 msgid "Freezing snow grains"
@@ -8290,9 +8396,8 @@ msgstr ""
 
 #. HAIL
 #: my-evolution/metar.c:106
-#, fuzzy
 msgid "Hail"
-msgstr "Sähköposti"
+msgstr ""
 
 #: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
@@ -8311,18 +8416,16 @@ msgid "Heavy hail"
 msgstr ""
 
 #: my-evolution/metar.c:106
-#, fuzzy
 msgid "Shallow hail"
-msgstr "Näytä kaikki"
+msgstr ""
 
 #: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
 #: my-evolution/metar.c:106
-#, fuzzy
 msgid "Partial hail"
-msgstr "Ensisijainen sähköposti"
+msgstr ""
 
 #: my-evolution/metar.c:106
 msgid "Hailstorm"
@@ -8341,9 +8444,8 @@ msgid "Drifting hail"
 msgstr ""
 
 #: my-evolution/metar.c:106
-#, fuzzy
 msgid "Freezing hail"
-msgstr "Tuleva posti"
+msgstr ""
 
 #. SMALL_HAIL
 #: my-evolution/metar.c:107
@@ -8396,9 +8498,8 @@ msgstr ""
 
 #. PRECIPITATION
 #: my-evolution/metar.c:108
-#, fuzzy
 msgid "Unknown precipitation"
-msgstr "Tuntematon todennustila."
+msgstr ""
 
 #: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
@@ -8429,9 +8530,8 @@ msgid "Partial precipitation"
 msgstr ""
 
 #: my-evolution/metar.c:108
-#, fuzzy
 msgid "Unknown thunderstorm"
-msgstr "Tuntematon virhe"
+msgstr ""
 
 #: my-evolution/metar.c:108
 msgid "Blowing precipitation"
@@ -8451,9 +8551,8 @@ msgstr ""
 
 #. MIST
 #: my-evolution/metar.c:109
-#, fuzzy
 msgid "Mist"
-msgstr "Neiti"
+msgstr ""
 
 #: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
@@ -8480,9 +8579,8 @@ msgid "Patches of mist"
 msgstr ""
 
 #: my-evolution/metar.c:109
-#, fuzzy
 msgid "Partial mist"
-msgstr "Pysty"
+msgstr ""
 
 #: my-evolution/metar.c:109
 msgid "Mist with wind"
@@ -8530,9 +8628,8 @@ msgid "Partial fog"
 msgstr ""
 
 #: my-evolution/metar.c:110
-#, fuzzy
 msgid "Fog with wind"
-msgstr "Sulje tämä ikkuna"
+msgstr ""
 
 #: my-evolution/metar.c:110
 msgid "Drifting fog"
@@ -8564,9 +8661,8 @@ msgid "Thick smoke"
 msgstr ""
 
 #: my-evolution/metar.c:111
-#, fuzzy
 msgid "Shallow smoke"
-msgstr "Näytä tehtävät"
+msgstr ""
 
 #: my-evolution/metar.c:111
 msgid "Patches of smoke"
@@ -8581,9 +8677,8 @@ msgid "Smoke w/ thunders"
 msgstr ""
 
 #: my-evolution/metar.c:111
-#, fuzzy
 msgid "Smoke with wind"
-msgstr "Sulje tämä ikkuna"
+msgstr ""
 
 #: my-evolution/metar.c:111
 msgid "Drifting smoke"
@@ -8640,9 +8735,8 @@ msgstr ""
 
 #. SAND
 #: my-evolution/metar.c:113
-#, fuzzy
 msgid "Sand"
-msgstr "Lähetä"
+msgstr ""
 
 #: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
@@ -8678,9 +8772,8 @@ msgstr ""
 
 #. HAZE
 #: my-evolution/metar.c:114
-#, fuzzy
 msgid "Haze"
-msgstr "Ylätunniste:"
+msgstr ""
 
 #: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
@@ -8724,9 +8817,8 @@ msgstr ""
 
 #. SPRAY
 #: my-evolution/metar.c:115
-#, fuzzy
 msgid "Sprays"
-msgstr "päivää"
+msgstr ""
 
 #: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
@@ -8770,9 +8862,8 @@ msgstr ""
 
 #. DUST
 #: my-evolution/metar.c:116
-#, fuzzy
 msgid "Dust"
-msgstr "Elokuu"
+msgstr ""
 
 #: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
@@ -9054,123 +9145,137 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "Vastattu"
+msgid " _Remove"
+msgstr "Poista"
 
 #: my-evolution/my-evolution.glade.h:2
-#, fuzzy
-msgid "All folders:"
-msgstr "Kansiot"
+msgid "Add n_ew feed"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
+msgid "Al_l stations:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "Lisää toiminto"
+msgid "All _folders:"
+msgstr "Paikalliset kansiot"
 
-#: my-evolution/my-evolution.glade.h:6
-#, fuzzy
-msgid "Display folders:"
-msgstr "Luonnoskansio:"
+#: my-evolution/my-evolution.glade.h:5
+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
-#, fuzzy
-msgid "Display stations:"
-msgstr "Näytä asetukset"
+msgid "How many days should the calendar display at once?"
+msgstr "Kuinka monta päivää kalenterissa näytetään kerrallaan?"
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-#, fuzzy
-msgid "Five days"
-msgstr "Perjantai"
+msgid "News Feed Settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "Yksi kuukausi"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "Yksi ´viikko"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
-msgstr ""
+#, fuzzy
+msgid "Refresh _time (seconds):"
+msgstr "Virkistysaika (sekunneissa):"
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr ""
+#, fuzzy
+msgid "Show _all tasks"
+msgstr "Näytä kaikki tehtävät"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "Näytä tämänpäiväiset tehtävät"
 
 #: my-evolution/my-evolution.glade.h:15
-#, fuzzy
-msgid "One day"
-msgstr "Keskiviikko"
+msgid "Tasks "
+msgstr "Tehtävät "
 
 #: my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "One month"
-msgstr "kuukausi"
+msgid "Units: "
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-#, fuzzy
-msgid "One week"
-msgstr " 1 viikko"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Näytä toinen kansio"
 
 #: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Show all tasks"
-msgstr "Näytä tehtävät"
+msgid "_Display stations:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
+msgid "_Displayed feeds:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "Näytä tehtävät"
+msgid "_Five days"
+msgstr "Viisi päivää"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "Tehtävät"
+msgid "_Mail"
+msgstr "_Matkapuhelin"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  Yksikkö: "
+msgid "_News Feeds"
+msgstr "_Uusi kansio"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "Muut"
+msgid "_One day"
+msgstr "Yksi päivä"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
-msgstr ""
+#, fuzzy
+msgid "_Refresh time (seconds):"
+msgstr "Virkistysaika (sekunneissa):"
 
 #: my-evolution/my-evolution.glade.h:27
-#, fuzzy
-msgid "imperial"
-msgstr "Huhtikuu"
+msgid "_Schedule"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "Näytä täydet _otsikkotiedot"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "Säätiedot"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9178,37 +9283,38 @@ msgid "The Evolution shell."
 msgstr ""
 
 #: shell/e-activity-handler.c:198
-#, fuzzy
 msgid "Show Details"
-msgstr "Yksityiskohtaiset"
+msgstr "Näytä yksityiskohdat"
 
 #: shell/e-activity-handler.c:200
-#, fuzzy
 msgid "Cancel Operation"
-msgstr "Peruuta tapaaminen"
+msgstr "Peruuta operaatio"
 
-#: shell/e-local-storage.c:554
-#, fuzzy
+#: shell/e-local-storage.c:551
 msgid "Local Folders"
-msgstr "Erikoiskansiot"
+msgstr "Paikalliset kansiot"
 
 #: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
-msgstr ""
+msgstr "Evolutionin asennus"
 
 #: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
+"Tämän Evolutionin uuden version täytyy asentaa uusia tiedostoja\n"
+"henkilökohtaiseen Evolution-hakemistoosi"
 
 #: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
+"Napsauta \"OK\" asentaaksesi tiedostot, tai \"Peruuta\" lopettaaksesi "
+"asennuksen."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
-msgstr ""
+msgstr "Tiedostojen päivitys ei onnistunut"
 
 #: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
@@ -9231,11 +9337,11 @@ msgstr ""
 "Virhe: %s"
 
 #: shell/e-setup.c:235
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
-msgstr "Virhe luettaessa tiedostoa."
+msgstr ""
 
 #: shell/e-setup.c:308
 #, c-format
@@ -9262,53 +9368,63 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:160
-#, fuzzy
+#: shell/e-shell-folder-commands.c:174
 msgid "Cannot move a folder over itself."
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:284
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:275
-#, fuzzy
+#: shell/e-shell-folder-commands.c:289
 msgid "Copy folder"
-msgstr "Kopioi kansioon"
+msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:327
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:318
-#, fuzzy
+#: shell/e-shell-folder-commands.c:332
 msgid "Move folder"
-msgstr "Siirrä kansioon"
+msgstr "Siirä kansio"
 
-#: shell/e-shell-folder-commands.c:354
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:367
+#, c-format
 msgid "Delete folder '%s'"
-msgstr "Poista %s:n päivän kuluttua"
+msgstr "Poista kansio '%s'"
 
-#: shell/e-shell-folder-commands.c:363
-#, fuzzy, c-format
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:377
+#, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
+msgstr "Haluatko todella poistaa kansion '%s'?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:452
 #, c-format
 msgid "Rename folder '%s'"
-msgstr ""
+msgstr "Nimeä kansio '%s' uudelleen"
+
+#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
+msgid "Rename"
+msgstr "Nimeä uudelleen"
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:464
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Kansion nimi:"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -9321,7 +9437,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -9335,7 +9451,7 @@ msgstr ""
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
@@ -9417,15 +9533,14 @@ msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
 #: shell/e-shell-importer.c:599
-#, fuzzy
 msgid "Select folder"
-msgstr "Valitse tiedosto"
+msgstr "Valitse kansio"
 
 #: shell/e-shell-importer.c:600
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
@@ -9457,280 +9572,270 @@ msgid "Select the folder that you want to open"
 msgstr ""
 
 #: shell/e-shell-view-menu.c:583
-#, fuzzy
 msgid "Create a new shortcut"
-msgstr "Luo uusi kontakti"
+msgstr ""
 
 #: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:689
-#, fuzzy
+#: shell/e-shell-view-menu.c:702
 msgid "Work Online"
 msgstr "Työskentele linjoilla"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
+#: ui/evolution.xml.h:35
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:177
 msgid "(No folder displayed)"
 msgstr ""
 
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1411
+#: shell/e-shell-view.c:1385
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1387
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1425
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1432
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1438
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:491
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1311
+#: shell/e-shell.c:1405
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:141
+#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1611
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:1613
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:1615
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1617 shell/e-storage.c:481
+msgid "Generic error"
+msgstr "Yleinen virhe"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Ryhmän nimi:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "Älä poista"
 
-#: shell/e-shortcuts-view.c:300
-#, fuzzy
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
-msgstr "_Piilota oikotiepalkki"
+msgstr "Nimeä oikotieryhmä uudelleen"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
-msgstr ""
+msgstr "Oikotieryhmän uusi nimi:"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
-msgstr ""
+msgstr "Näytä oikotiet pieninä kuvakkeina"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
-msgstr ""
+msgstr "Näytä oikotiet suurina kuvakkeina"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Uusi ryhmä..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
-msgstr ""
+msgstr "Luo uusi oikotieryhmä"
 
-#: shell/e-shortcuts-view.c:332
-#, fuzzy
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
-msgstr "_Poista tämä ryhmä..."
+msgstr "Poista tämä _ryhmä..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
-msgstr ""
+msgstr "Poista tämä oikotieryhmä"
 
-#: shell/e-shortcuts-view.c:335
-#, fuzzy
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
-msgstr "_Poista tämä ryhmä..."
+msgstr "_Nimeä tämä ryhmä uudelleen..."
 
-#: shell/e-shortcuts-view.c:336
-#, fuzzy
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
-msgstr "Poista tämä oikotie oikotiepalkista"
+msgstr "Nimeä tämä oikotieryhmä uudelleen"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:461
-#, fuzzy
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
-msgstr "Piilota oikotiepalkki"
+msgstr "Nimeä oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
-msgstr ""
+msgstr "Oikotien uusi nimi:"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Avaa"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
-msgstr ""
+msgstr "Avaa tämän oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: shell/e-shortcuts-view.c:476
-#, fuzzy
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Avaa valittu viesti uudessa ikkunassa"
-
-#: shell/e-shortcuts-view.c:479
-#, fuzzy
-msgid "Rename"
-msgstr "Säännön nimi: "
+msgstr "Avaa tämän oikotien osoittama kansio uudessa ikkunassa"
 
-#: shell/e-shortcuts-view.c:479
-#, fuzzy
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
-msgstr "Piilota oikotiepalkki"
+msgstr "Nimeä tämä oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista tämä oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:620
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteitä."
 
-#: shell/e-shortcuts.c:982
-#, fuzzy
+#: shell/e-shortcuts.c:1019
 msgid "Shortcuts"
-msgstr "_Oikotiepalkki"
+msgstr "Oikotiet"
 
-#: shell/e-shortcuts.c:984
+#. 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 ""
+msgstr "Saapuneet"
 
-#: shell/e-shortcuts.c:987
-#, fuzzy
+#: shell/e-shortcuts.c:1026
 msgid "Contacts"
-msgstr "_Kontakti"
+msgstr "Kontaktit"
 
-#: shell/e-storage.c:178 shell/e-storage.c:184
+#: 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:475
+#: shell/e-storage.c:479
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "Yleinen virhe"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:483
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:485
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:487
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:489
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:491
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:493
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:497
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:499
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:168
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
 msgid "%s (%d%% complete)"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "Active connections"
-msgstr "Mikä tahansa kenttä sisältää"
+msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-#, fuzzy
 msgid "Host"
-msgstr "Isäntäpalvelin:"
+msgstr "Isäntäpalvelin"
 
 #: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Kansion nimi:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Kansion tyyppi:"
@@ -9763,9 +9868,8 @@ msgid "Importers"
 msgstr ""
 
 #: shell/importer/intelligent.c:197
-#, fuzzy
 msgid "Don't import"
-msgstr "Älä poista"
+msgstr "Älä tuo"
 
 #: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
@@ -9775,7 +9879,7 @@ msgstr "Älä kysy tätä enää uudelleen"
 msgid "Evolution has found the following data sources:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9792,7 +9896,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9800,19 +9904,24 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:155
+#: shell/main.c:154
 msgid "Cannot access the Evolution shell."
 msgstr ""
 
-#: shell/main.c:215
+#: shell/main.c:163
+#, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr ""
+
+#: shell/main.c:221
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:216
+#: shell/main.c:222
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:261
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
@@ -9830,9 +9939,8 @@ msgid "Create new contact"
 msgstr "Luo uusi kontakti"
 
 #: ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Create new contact list"
-msgstr "Luo uusi kontakti"
+msgstr "Luo uusi kontaktiluettelo"
 
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
 msgid "Cut"
@@ -9843,18 +9951,16 @@ msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
 #: ui/evolution-addressbook.xml.h:9
-#, fuzzy
 msgid "Delete selected contacts"
-msgstr "Poista kontakti"
+msgstr "Poista valitut kontaktit"
 
 #: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Uusi kontakti"
 
 #: ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "New list"
-msgstr "Uusi sähköposti"
+msgstr "Uusi luettelo"
 
 #: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
 msgid "Paste"
@@ -9865,60 +9971,90 @@ msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
 #: ui/evolution-addressbook.xml.h:14
-#, fuzzy
 msgid "Previews the contacts to be printed"
-msgstr "Esikatselee tulostettavaa kalenteria"
+msgstr "Esikatselee tulostettavia kontakteja"
 
 #: ui/evolution-addressbook.xml.h:17
-#, fuzzy
 msgid "Print selected contacts"
-msgstr "Tulosta kontaktit"
+msgstr "Tulosta valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save selected contacts as a VCard."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select all contacts"
-msgstr "Poista kontakti"
+msgstr "Valitse kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:20
+#: 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:24
+msgid "Send a mess to the selected contacts."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27
+msgid "Send selected contacts to another person."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Pysäytä lataaminen"
 
-#: ui/evolution-addressbook.xml.h:22
+#: 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-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-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
 msgid "_Addressbook Sources..."
 msgstr "_Osoitekirjan lähteet..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-addressbook.xml.h:24
-#, fuzzy
-msgid "_Contact Group"
-msgstr "_Kontakti"
+#: ui/evolution-addressbook.xml.h:33
+msgid "_Contact List"
+msgstr "_Kontaktiluettelo"
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: 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
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:37
+msgid "_Save as VCard"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: 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
 msgid "_Tools"
 msgstr "T_yökalut"
 
@@ -9927,14 +10063,12 @@ msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-#, fuzzy
 msgid "Create a New All-Day _Event"
-msgstr "Luo uusi koko päivän tapahtuma"
+msgstr "Luo uusi koko päivän _tapahtuma"
 
 #: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a _New Appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "Luo uusi t_apaaminen"
 
 #: ui/evolution-calendar.xml.h:6
 msgid "Create a new appointment"
@@ -9942,7 +10076,7 @@ msgstr "Luo uusi tapaaminen"
 
 #: ui/evolution-calendar.xml.h:7
 msgid "Create an event for the whole day"
-msgstr ""
+msgstr "Luo uusi koko päivän tapahtuma"
 
 #: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
@@ -9985,9 +10119,8 @@ msgid "Print this Calendar"
 msgstr "Tulosta tämä kalenteri"
 
 #: ui/evolution-calendar.xml.h:22
-#, fuzzy
 msgid "Publish Free/Busy Information"
-msgstr "Pakolliset tiedot"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
@@ -10013,25 +10146,23 @@ msgstr "Näytä työviikko"
 msgid "W_ork Week"
 msgstr "Työviikk_o"
 
-#: ui/evolution-calendar.xml.h:29
-#, fuzzy
+#: ui/evolution-calendar.xml.h:30
 msgid "_Appointment..."
-msgstr "_Tapaaminen"
+msgstr "T_apaaminen..."
 
-#: ui/evolution-calendar.xml.h:30
-#, fuzzy
+#: ui/evolution-calendar.xml.h:31
 msgid "_Calendar Settings..."
-msgstr "_Sähköpostiasetukset..."
+msgstr "_Kalenterin asetukset..."
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:33
 msgid "_Day"
 msgstr "_Päivä"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:34
 msgid "_Month"
 msgstr "_Kuukausi"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:38
 msgid "_Week"
 msgstr "_Viikko"
 
@@ -10051,35 +10182,32 @@ msgstr "Sulje tämä tapaaminen"
 msgid "Delete this appointment"
 msgstr "Poista tämä tapaaminen"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:7
-#, fuzzy
 msgid "Preview the printed item"
-msgstr "Esikatsele tulostettavaa viestiä"
+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
-#, fuzzy
 msgid "Print S_etup"
-msgstr "Tulostusasetukset"
+msgstr "Tulostusasetuks_et"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Tulosta tämä kohta"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:13
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
@@ -10095,39 +10223,36 @@ msgstr ""
 msgid "Setup the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-comp-editor.xml.h:19
-#, fuzzy
-msgid "_Action"
-msgstr "T_oiminnot"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: 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:47
+#: ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Poista tämä kohta"
 
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete..."
-msgstr "Poista..."
-
 #: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Ohje"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: 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ä..."
@@ -10148,60 +10273,56 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "Lähetä _viesti kontaktille..."
 
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ui/evolution-contact-list-editor.xml.h:2
-#, fuzzy
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
-msgstr "Poista tämä kohta"
+msgstr "Poista tämä luettelo"
 
-#: ui/evolution-contact-list-editor.xml.h:6
-#, fuzzy
-msgid "Save the list and close the dialog box"
-msgstr "Tallenna tehtävä ja sulje ikkuna"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Poista..."
 
 #: ui/evolution-contact-list-editor.xml.h:7
-#, fuzzy
-msgid "Se_nd list to other..."
-msgstr "Lähetä _viesti kontaktille..."
+msgid "Save the list and close the dialog box"
+msgstr "Tallenna luettelo ja sulje ikkuna"
 
 #: ui/evolution-contact-list-editor.xml.h:8
-#, fuzzy
+msgid "Se_nd list to other..."
+msgstr ""
+
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
-msgstr "Lähetä _viesti kontaktille..."
+msgstr ""
 
 #: ui/evolution-event-editor.xml.h:1
-#, fuzzy
 msgid "Cancel Mee_ting"
-msgstr "Peruuta tapaaminen"
+msgstr "Peruuta _tapaaminen"
 
 #: ui/evolution-event-editor.xml.h:2 ui/evolution-task-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
-#, fuzzy
 msgid "Forward as i_Calendar"
-msgstr "Ladataan kalenteria"
+msgstr ""
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
-#, fuzzy
 msgid "Forward this item via email"
-msgstr "Välitä tämä viesti"
+msgstr ""
 
 #: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
 msgstr ""
 
 #: ui/evolution-event-editor.xml.h:6
-#, fuzzy
 msgid "Re_fresh Meeting"
-msgstr "Peruuta tapaaminen"
+msgstr ""
 
 #: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
@@ -10211,32 +10332,23 @@ msgstr ""
 msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
-msgid "_Actions"
-msgstr "T_oiminnot"
-
 #: ui/evolution-executive-summary.xml.h:1
-#, fuzzy
 msgid "Customise My Evolution"
-msgstr "%s - Evolution %s"
+msgstr ""
 
 #: ui/evolution-mail-global.xml.h:1
-#, fuzzy
 msgid "Cancel"
-msgstr "Peruutettu"
+msgstr "Peruuta"
 
 #: ui/evolution-mail-global.xml.h:2
-#, fuzzy
 msgid "Cancel the current mail operation"
-msgstr "Tallenna nykyinen tiedosto"
+msgstr "Peruuta nykyinen postioperaatio"
 
 #: ui/evolution-mail-global.xml.h:3
 msgid "Compose"
 msgstr "Kirjoita"
 
 #: ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Compose _New Message"
 msgstr "Kirjoita uusi viesti"
 
@@ -10254,7 +10366,7 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
-msgstr ""
+msgstr "_Tyhjennä roskakori"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
@@ -10265,35 +10377,30 @@ msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
+msgid "Open a window for composing a mail message"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:12
-msgid "Open a window for composing a mail message"
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:13
-#, fuzzy
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Siirrä valitut viestit toiseen kansioon"
-
-#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
@@ -10310,27 +10417,28 @@ msgid "_Mail Settings..."
 msgstr "_Sähköpostiasetukset..."
 
 #: ui/evolution-mail-global.xml.h:22
-#, fuzzy
 msgid "_Preview Pane"
-msgstr "Esikatselu:"
+msgstr "_Esikatseluruutu:"
 
 #: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
+#: ui/evolution-mail-global.xml.h:24
+msgid "_Subscribe to Folders..."
+msgstr ""
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Copy selected messages"
-msgstr "Poista valitut viestit"
+msgstr "Kopioi valitut viestit"
 
 #: ui/evolution-mail-list.xml.h:5
-#, fuzzy
 msgid "Cut selected messages"
-msgstr "Poista valitut viestit"
+msgstr "Leikkaa valitut viestit"
 
 #: ui/evolution-mail-list.xml.h:6
 msgid "Hide S_elected Messages"
@@ -10341,7 +10449,6 @@ msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
 #: ui/evolution-mail-list.xml.h:8
-#, fuzzy
 msgid "Hide _Read Messages"
 msgstr "Piilota _luetut viestit"
 
@@ -10355,19 +10462,16 @@ msgid "Mark All as R_ead"
 msgstr "Merkitse ka_ikki luetuksi"
 
 #: ui/evolution-mail-list.xml.h:11
-#, fuzzy
 msgid "Mark all visible messages as read"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr "Merkitse kaikki näkyvät viestit luetuiksi"
 
 #: ui/evolution-mail-list.xml.h:13
-#, fuzzy
 msgid "Paste message in the clipboard"
-msgstr "Liitä leikepöytä"
+msgstr "Liitä viesti leikepöydälle"
 
 #: ui/evolution-mail-list.xml.h:14
-#, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Siirrä valitut viestit toiseen kansioon"
+msgstr ""
 
 #: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
@@ -10386,71 +10490,64 @@ msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:19
-#, fuzzy
 msgid "Select all visible messages"
-msgstr "Poista valitut viestit"
+msgstr "Valitse kaikki näkyvät viestit"
 
 #: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Näytä k_aikki"
+msgid "Sh_ow Hidden Messages"
+msgstr "Näytä piil_otetut viestit"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
+msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
 
 #: ui/evolution-mail-list.xml.h:22
-#, fuzzy
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr "Piilota kaikki luetut viestit väliaikaisesti"
 
 #: ui/evolution-mail-list.xml.h:23
-#, fuzzy
 msgid "Temporarily hide the selected messages"
-msgstr "Poista valitut viestit"
+msgstr "Piilota valitut viestit väliaikaisesti"
 
 #: ui/evolution-mail-list.xml.h:24
 msgid "Threaded Message list"
 msgstr "Säikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Käännä valinta"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: ui/evolution-mail-list.xml.h:29
-#, fuzzy
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
-msgstr "Säikeistetty viesti-ikkuna"
+msgstr "Säikeis_tetty viesti-ikkuna"
 
 #: ui/evolution-mail-message.xml.h:1
-#, fuzzy
 msgid "Apply filter rules to the selected messages"
-msgstr "Poista valitut viestit"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:2
-#, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Vastaa kaikille tämän viestin vastaanottajille"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:4
-#, fuzzy
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Vastaa tämän viestin lähettäjälle"
+msgstr "Vastaa valitun viestin lähettäjälle"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
@@ -10493,58 +10590,48 @@ msgid "Create a virtual folder for this subject"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:17
-#, fuzzy
 msgid "Display the next important message"
-msgstr "Vastaa tämän viestin lähettäjälle"
+msgstr "Näytä seuraava tärkeä viesti"
 
 #: ui/evolution-mail-message.xml.h:18
-#, fuzzy
 msgid "Display the next message"
-msgstr "Siirry seuraavaan viestiin"
+msgstr "Näytä seuraava viesti"
 
 #: ui/evolution-mail-message.xml.h:19
-#, fuzzy
 msgid "Display the next unread message"
-msgstr "Poista valitut viestit"
+msgstr "Näytä seuraava lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
-msgstr ""
+msgstr "Näytä seuraava lukematon säie"
 
 #: ui/evolution-mail-message.xml.h:21
-#, fuzzy
 msgid "Display the previous important message"
-msgstr "Siirry edelliseen viestiin"
+msgstr "Näytä edellinen tärkeä viesti"
 
 #: ui/evolution-mail-message.xml.h:22
-#, fuzzy
 msgid "Display the previous message"
-msgstr "Siirry edelliseen viestiin"
+msgstr "Näytä edellinen viesti"
 
 #: ui/evolution-mail-message.xml.h:23
-#, fuzzy
 msgid "Display the previous unread message"
-msgstr "Siirry edelliseen viestiin"
+msgstr "Näytä edellinen lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:24
-#, fuzzy
 msgid "Filter on Mailing _List..."
-msgstr "Suodata post-ituslistan mukaan"
+msgstr "Suodata postitus_listan mukaan..."
 
 #: ui/evolution-mail-message.xml.h:25
-#, fuzzy
 msgid "Filter on Se_nder..."
-msgstr "Suodata _lähettäjän mukaan"
+msgstr "Suodata _lähettäjän mukaan..."
 
 #: ui/evolution-mail-message.xml.h:26
-#, fuzzy
 msgid "Filter on _Recipients..."
-msgstr "Suodata _vastaanottajien mukaan"
+msgstr "Suodata _vastaanottajien mukaan..."
 
 #: ui/evolution-mail-message.xml.h:27
-#, fuzzy
 msgid "Filter on _Subject..."
-msgstr "Suodata _aiheen mukaan"
+msgstr "Suodata _aiheen mukaan..."
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
@@ -10563,72 +10650,60 @@ msgid "Forward _Attached"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:32
-#, fuzzy
 msgid "Forward _Inline"
-msgstr "Välitä"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:33
-#, fuzzy
 msgid "Forward _Quoted"
-msgstr "Välitä"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:34
-#, fuzzy
 msgid "Forward the selected message in the body of a new message"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:35
-#, fuzzy
 msgid "Forward the selected message quoted like a reply"
-msgstr "Merkitse valitut viestit lukemattomiksi"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:36
-#, fuzzy
 msgid "Forward the selected message to someone"
-msgstr "Siirrä valitut viestit toiseen kansioon"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
-#, fuzzy
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:39
-#, fuzzy
 msgid "Load _Images"
-msgstr "Välitetyt viestit"
+msgstr "Lataa k_uvat"
 
 #: ui/evolution-mail-message.xml.h:41
-#, fuzzy
 msgid "Mark as I_mportant"
-msgstr "Merkitse luke_mattomaksi"
+msgstr "Merkitse _tärkeäksi"
 
 #: ui/evolution-mail-message.xml.h:43
-#, fuzzy
 msgid "Mark as Unimp_ortant"
-msgstr "Merkitse luke_mattomaksi"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
 #: ui/evolution-mail-message.xml.h:45
-#, fuzzy
 msgid "Mark the selected messages as important"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr "Merkitse valitut viestit tärkeiksi"
 
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
 #: ui/evolution-mail-message.xml.h:47
-#, fuzzy
 msgid "Mark the selected messages as unimportant"
-msgstr "Merkitse valitut viestit lukemattomiksi"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:48
-#, fuzzy
 msgid "Mark the selected messages for deletion"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr "Merkitse valitut viestit poistettaviksi"
 
 #: ui/evolution-mail-message.xml.h:49
 msgid "Move"
@@ -10643,34 +10718,28 @@ msgid "Next"
 msgstr "Seuraava"
 
 #: ui/evolution-mail-message.xml.h:52
-#, fuzzy
 msgid "Next Important Message"
-msgstr "Seuraava viesti"
+msgstr "Seuraava tärkeä viesti"
 
 #: ui/evolution-mail-message.xml.h:53
-#, fuzzy
 msgid "Next Message"
 msgstr "Seuraava viesti"
 
 #: ui/evolution-mail-message.xml.h:54
-#, fuzzy
 msgid "Next Thread"
-msgstr "Valitse _säie"
+msgstr "Seuraava säie"
 
 #: ui/evolution-mail-message.xml.h:55
-#, fuzzy
 msgid "Next Unread Message"
-msgstr "Seuraava viesti"
+msgstr "Seuraava lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:56
-#, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
 #: ui/evolution-mail-message.xml.h:57
-#, fuzzy
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Merkitse valitut viestit luetuiksi"
+msgstr "Avaa valittu viesti muokkaimeen uudelleenlähettämistä varten"
 
 #: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
@@ -10681,34 +10750,28 @@ msgid "Previous"
 msgstr "Edellinen"
 
 #: ui/evolution-mail-message.xml.h:60
-#, fuzzy
 msgid "Previous Important Message"
-msgstr "Edellinen viesti"
+msgstr "Edellinen tärkeä viesti"
 
 #: ui/evolution-mail-message.xml.h:61
-#, fuzzy
 msgid "Previous Message"
 msgstr "Edellinen viesti"
 
 #: ui/evolution-mail-message.xml.h:62
-#, fuzzy
 msgid "Previous Unread Message"
-msgstr "Edellinen viesti"
+msgstr "Edellinen lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:64
-#, fuzzy
 msgid "Print Message..."
 msgstr "Tulosta viesti..."
 
 #: ui/evolution-mail-message.xml.h:65
-#, fuzzy
 msgid "Print Preview..."
-msgstr "Tulostuksen esikatselu"
+msgstr "Tulostuksen esikatselu..."
 
 #: ui/evolution-mail-message.xml.h:66
-#, fuzzy
 msgid "Print this message"
-msgstr "Tulosta viesti"
+msgstr "Tulosta tämä viesti"
 
 #: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
@@ -10723,9 +10786,8 @@ msgid "S_earch Message"
 msgstr "_Etsi viestiä"
 
 #: ui/evolution-mail-message.xml.h:72
-#, fuzzy
 msgid "Save the message as a text file"
-msgstr "Tallenna viesti uuteen tiedostoon"
+msgstr "Tallenna viesti tiedostona"
 
 #: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
@@ -10736,116 +10798,90 @@ msgid "Show Email _Source"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:75
-#, fuzzy
 msgid "Show Full _Headers"
-msgstr "Täydet _otsikkotiedot"
+msgstr "Näytä täydet _otsikkotiedot"
 
 #: ui/evolution-mail-message.xml.h:76
-#, fuzzy
 msgid "Show message in the normal style"
-msgstr "Ajan tulee olla muodossa: %s"
+msgstr "Näytä viesti normaalimuodossa"
 
 #: ui/evolution-mail-message.xml.h:77
-#, fuzzy
 msgid "Show message with all email headers"
-msgstr "Etsi uusia viestejä kaikista kansioista"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:78
-#, fuzzy
 msgid "Show the raw email source of the message"
-msgstr "Lisää viestiin liitetiedoston"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
 #: ui/evolution-mail-message.xml.h:80
-#, fuzzy
 msgid "VFolder on Mailing _List..."
-msgstr "Suodata post-ituslistan mukaan"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:81
-#, fuzzy
 msgid "VFolder on Se_nder..."
-msgstr "Suodata _lähettäjän mukaan"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:82
-#, fuzzy
 msgid "VFolder on _Recipients..."
-msgstr "Suodata _vastaanottajien mukaan"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:83
-#, fuzzy
 msgid "VFolder on _Subject..."
-msgstr "Suodata _aiheen mukaan"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
-msgstr "Kopioi kansioon"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail-message.xml.h:88
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Forward Message"
-msgstr "Välitetyt viestit"
+msgstr "_Välitetä viesti"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Message Display"
-msgstr "Viestit"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Move to Folder"
-msgstr "Siirrä kansioon"
+msgstr "_Siirrä kansioon"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Open Message"
-msgstr "Lähetä viestejä _uudelleen"
+msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Re-send Message"
-msgstr "Lähetä viestejä _uudelleen"
+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"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
-msgid "Customi_ze Toolbars..."
-msgstr "Mukauta t_yökalupalkkeja..."
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Mukauta"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "Mukauta työkalupalkkeja"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
+#: 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:42
+#: ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_Näytä"
 
@@ -10858,9 +10894,8 @@ msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
 #: ui/evolution-message-composer.xml.h:5
-#, fuzzy
 msgid "Delete all but signature"
-msgstr "Poista kontakti"
+msgstr "Poista kaikki paitsi allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
@@ -10879,9 +10914,8 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-#, fuzzy
 msgid "Inline Text _File..."
-msgstr "Liitä tekstitiedosto..."
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
@@ -10904,18 +10938,12 @@ msgid "PGP Sign"
 msgstr "PGP-allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:17
-#, fuzzy
 msgid "S/MIME Encrypt"
-msgstr "PGP-salaus"
+msgstr "S/MIME-salaus"
 
 #: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Tallenna"
+msgstr "S/MIME-allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
@@ -10923,7 +10951,7 @@ msgstr "Tallenna nimellä"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
-msgstr ""
+msgstr "Tallenna _luonnos"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
@@ -10983,9 +11011,8 @@ msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
 #: ui/evolution-message-composer.xml.h:37
-#, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Allekirjoita viesti PGP-avaimellasi"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
@@ -10993,7 +11020,7 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
-msgstr ""
+msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
 #: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
@@ -11004,9 +11031,8 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
 #: ui/evolution-message-composer.xml.h:42
-#, fuzzy
 msgid "_Attachment..."
-msgstr "_Liite"
+msgstr "_Liite..."
 
 #: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
@@ -11014,7 +11040,7 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
-msgstr ""
+msgstr "_Kopio-kenttä"
 
 #: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
@@ -11022,9 +11048,8 @@ msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-#, fuzzy
 msgid "_Delete all"
-msgstr "_Poista"
+msgstr "_Poista kaikki"
 
 #: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
@@ -11047,7 +11072,7 @@ msgstr "_Vastausosoite-kenttä"
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -11080,14 +11105,12 @@ msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
 #: ui/evolution-task-editor.xml.h:1
-#, fuzzy
 msgid "Cancel Task"
-msgstr "Uusi tehtävä"
+msgstr "Peruuta tehtävä"
 
 #: ui/evolution-task-editor.xml.h:3
-#, fuzzy
 msgid "Delegate Task"
-msgstr "Poista tehtävä"
+msgstr "Delegoi tehtävä"
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Re_fresh Task"
@@ -11098,41 +11121,36 @@ msgid "Configure the task view's settings"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:3
-#, fuzzy
 msgid "Copy selected task"
-msgstr "Kopioi valinta"
+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
-#, fuzzy
 msgid "Cut selected task"
-msgstr "Poista tehtävä"
+msgstr "Leikkaa valittu tehtävä"
 
 #: ui/evolution-tasks.xml.h:7
-#, fuzzy
 msgid "Delete selected tasks"
-msgstr "Poista tehtävä"
+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
-#, fuzzy
 msgid "Paste task from the clipboard"
-msgstr "Liitä leikepöytä"
+msgstr "Liitä tehtävä leikepöydältä"
 
 #: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
-msgstr ""
+msgstr "Tallenna tehtävä jossain muussa muodossa"
 
 #: ui/evolution-tasks.xml.h:13
-#, fuzzy
 msgid "Tasks Settings"
-msgstr "_Sähköpostiasetukset..."
+msgstr "Tehtävän asetukset"
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -11143,200 +11161,170 @@ msgid "About Evolution..."
 msgstr "Tietoja Evolutionista..."
 
 #: ui/evolution.xml.h:2
-#, fuzzy
 msgid "Add to _Shortcut Bar"
-msgstr "_Oikotiepalkki"
+msgstr "Lisää _oikotiepalkkiin"
 
 #: ui/evolution.xml.h:3
 msgid "Change the name of this folder"
-msgstr ""
+msgstr "Muuta tämän kansion nimeä"
 
 #: ui/evolution.xml.h:6
-#, fuzzy
 msgid "Copy this folder"
-msgstr "Kopioi kansioon"
+msgstr "Kopioi tämä kansio"
 
 #: ui/evolution.xml.h:7
-#, fuzzy
 msgid "Create _New Folder..."
-msgstr "Luodaan uutta kansiota"
+msgstr "Luo _uusi kansio"
 
 #: ui/evolution.xml.h:8
-#, fuzzy
 msgid "Create a link to this folder in the shortcut bar"
-msgstr "Poista tämä oikotie oikotiepalkista"
+msgstr "Luo oikotie tähän kansioon oikotiepalkkiin"
 
 #: ui/evolution.xml.h:9
-#, fuzzy
 msgid "Create a new folder"
-msgstr "Luodaan uutta kansiota"
+msgstr "Luo uusi kansio"
 
-#: ui/evolution.xml.h:13
-#, fuzzy
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
-msgstr "Poista tämä kohta"
+msgstr "Poista tämä kansio"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
-msgstr ""
+msgstr "Näytä toinen kansio"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:16
-#, fuzzy
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
-msgstr "Evolution"
+msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:22
-#, fuzzy
+#: ui/evolution.xml.h:19
 msgid "Move this folder to another place"
-msgstr "Siirrä valitut viestit toiseen kansioon"
+msgstr "Siirrä tämä kansio toiseen paikkaan"
 
-#: ui/evolution.xml.h:24
-#, fuzzy
+#: ui/evolution.xml.h:21
 msgid "Open in New _Window"
-msgstr "Avaa uudessa ikkunassa"
+msgstr "Avaa uudessa _ikkunassa"
 
-#: ui/evolution.xml.h:25
-#, fuzzy
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
-msgstr "Avaa valittu viesti uudessa ikkunassa"
+msgstr "Avaa valittu kansio uudessa ikkunassa"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Lähetä virheraportti"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Lähetä _virheraportti"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
-msgstr "Lähetä virheraportti käyttäen Bug Buddy:a."
+#: ui/evolution.xml.h:26
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Lähetä virheraportti käyttäen Bug Buddy:a"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:27
 msgid "Toggle"
-msgstr ""
+msgstr "Määritä"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Määritä, näytetäänkö kansiopalkki"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Määritä, näytetäänkö oikotiepalkki"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:31
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:32
 msgid "Using the _Calendar"
 msgstr "_Kalenterin käyttö"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:33
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:34
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:36
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Tapaaminen"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Kontakti"
-
-#: ui/evolution.xml.h:44
-#, fuzzy
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
-msgstr "_Kopioi"
+msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:43
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:44
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:46
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:47
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr ""
-
-#: ui/evolution.xml.h:55
-#, fuzzy
+#: ui/evolution.xml.h:48
 msgid "_Move..."
-msgstr "Siirrä"
+msgstr "_Siirrä..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:58
-#, fuzzy
+#: ui/evolution.xml.h:51
 msgid "_Rename..."
-msgstr "_Avaa..."
+msgstr "_Nimeä uudelleen..."
 
-#: ui/evolution.xml.h:59
-#, fuzzy
+#: ui/evolution.xml.h:52
 msgid "_Shortcut"
-msgstr "_Oikotiepalkki"
+msgstr "_Oikotie"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:53
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_Tehtävä"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr ""
 
@@ -11345,14 +11333,12 @@ msgid "Change the settings for My Evolution"
 msgstr ""
 
 #: ui/my-evolution.xml.h:4
-#, fuzzy
 msgid "_My Evolution Settings..."
-msgstr "_Sähköpostiasetukset..."
+msgstr ""
 
 #: views/addressbook/galview.xml.h:1
-#, fuzzy
 msgid "Address Cards"
-msgstr "Osoite _2:"
+msgstr "Osoitekortit"
 
 #: views/addressbook/galview.xml.h:2
 msgid "By Company"
@@ -11389,10 +11375,6 @@ msgstr "Ryhmän mukaan"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr ""
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
@@ -11465,7 +11447,7 @@ msgstr ""
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr ""
 
@@ -11475,6 +11457,11 @@ msgstr ""
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nyt"
@@ -11483,10 +11470,6 @@ msgstr "Nyt"
 msgid "Today"
 msgstr "Tänään"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
 #: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
@@ -11494,79 +11477,72 @@ msgstr "Ajan tulee olla muodossa: %s"
 
 #: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
-msgstr ""
+msgstr "Balttilainen"
 
 #: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
-msgstr ""
+msgstr "Keskieurooppalainen"
 
 #: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
-msgstr ""
+msgstr "Kiinalainen"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
-msgstr ""
+msgstr "Kyrillinen"
 
 #: widgets/misc/e-charset-picker.c:63
-#, fuzzy
 msgid "Greek"
-msgstr "viikko"
+msgstr "Kreikkalainen"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
-msgstr ""
+msgstr "Japanilainen"
 
 #: widgets/misc/e-charset-picker.c:65
 msgid "Korean"
-msgstr ""
+msgstr "Korealainen"
 
 #: widgets/misc/e-charset-picker.c:66
-#, fuzzy
 msgid "Turkish"
-msgstr "Roskakori"
+msgstr "Turkkilainen"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:68
 msgid "Western European"
-msgstr ""
+msgstr "Länsieurooppalainen"
 
 #: widgets/misc/e-charset-picker.c:85
-#, fuzzy
 msgid "Traditional"
-msgstr ""
-"\n"
-"  Muut nimet: "
+msgstr "Perinteinen"
 
 #: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
-msgstr ""
+msgstr "Yksinkertaistettu"
 
 #: widgets/misc/e-charset-picker.c:91
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ukrainalainen"
 
 #: widgets/misc/e-charset-picker.c:102
-#, fuzzy
 msgid "New"
-msgstr "_Uusi"
+msgstr "Uusi"
 
 #: widgets/misc/e-charset-picker.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown character set: %s"
-msgstr "Tuntematon virhe: %s"
+msgstr ""
 
 #: widgets/misc/e-charset-picker.c:202
 msgid "Enter the character set to use"
 msgstr ""
 
 #: widgets/misc/e-charset-picker.c:277
-#, fuzzy
 msgid "Other..."
-msgstr "Muut"
+msgstr "Muut..."
 
 #: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
@@ -11576,27 +11552,18 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
-#, fuzzy
+#: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
-msgstr "Kontaktinhallinta"
+msgstr ""
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Edistynyt haku"
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr ""
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Tiedoksi"
@@ -11622,10 +11589,14 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:312
 msgid "Sear_ch"
 msgstr "_Etsi"
 
+#: widgets/misc/e-search-bar.c:407
+msgid "Find Now"
+msgstr "Etsi nyt"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -11646,341 +11617,55 @@ msgstr "init_corba(): GNOME:n alustus epäonnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus epäonnistui"
 
-#, fuzzy
-#~ msgid "Set task view preferences"
-#~ msgstr "Muuta asetuksia"
-
-#, fuzzy
-#~ msgid "TasksPreferences"
-#~ msgstr "Tehtäväasetukset"
-
-#~ msgid "???"
-#~ msgstr "???"
-
-#~ msgid "C_ontacts..."
-#~ msgstr "K_ontaktit..."
-
-#~ msgid "_Company:"
-#~ msgstr "_Yritys:"
-
-#~ msgid "Find..."
-#~ msgstr "Etsi..."
-
-#~ msgid "Open calendar"
-#~ msgstr "Avaa kalenteri"
-
-#~ msgid "Save calendar"
-#~ msgstr "Tallenna kalenteri"
-
-#~ msgid "<b>Error loading calendar:<br>Method not supported"
-#~ msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tueta"
-
-#~ msgid "Colors"
-#~ msgstr "Värit"
-
-#~ msgid "Highlight"
-#~ msgstr "Korosta"
-
-#~ msgid "Work week"
-#~ msgstr "Työviikko"
-
-#~ msgid "Edit Task"
-#~ msgstr "Muokkaa tehtävää"
-
-#~ msgid "Edit this task..."
-#~ msgstr "Muokkaa tätä tehtävää..."
-
-#~ msgid "Edit the task"
-#~ msgstr "Muokkaa tehtävää"
-
-#~ msgid "Go to Today"
-#~ msgstr "Siirry tähän päivään"
-
-#~ msgid "I couldn't load your calendar file!\n"
-#~ msgstr "En pystynyt lataamaan kalenteritiedostoasi!\n"
-
-#~ msgid "I couldn't read your calendar file!\n"
-#~ msgstr "En pystynyt lukemaan kalenteritiedostoasi!\n"
-
-#~ msgid "Add to Calendar"
-#~ msgstr "Lisää kalenteriin"
-
-#~ msgid "Update Calendar"
-#~ msgstr "Päivitä kalenteri"
-
-#~ msgid "Attendee address"
-#~ msgstr "Osanottajan osoite"
-
-#~ msgid "Attendees: "
-#~ msgstr "Osanottajat: "
-
-#~ msgid ""
-#~ "Cancel\n"
-#~ "Meeting"
-#~ msgstr ""
-#~ "Peruuta\n"
-#~ "tapaaminen"
-
-#~ msgid "_Starting date:"
-#~ msgstr "_Alkamispäivä:"
-
-#~ msgid "Summary contains"
-#~ msgstr "Yhteenveto sisältää"
-
-#~ msgid "Comment contains"
-#~ msgstr "Kommentti sisältää"
-
-#~ msgid "Has category"
-#~ msgstr "Sisältää ryhmän"
+#~ msgid "Category contains"
+#~ msgstr "Ryhmä sisältää"
 
-#~ msgid "That is not a regular file."
-#~ msgstr "Se ei ole tavallinen tiedosto."
+#~ msgid "Select name from _folder:"
+#~ msgstr "Valitse nimi _kansiosta:"
 
-#~ msgid "That file appeared accesible but open(2) failed."
-#~ msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
-
-#~ msgid ""
-#~ "The file is very large (more than 100K).\n"
-#~ "Are you sure you wish to insert it?"
-#~ msgstr ""
-#~ "Tiedosto on hyvin suuri (yli 100K).\n"
-#~ "Haluatko varmasti liittää sen?"
-
-#~ msgid "%I:%M:%S %p%n"
-#~ msgstr "%I:%M:%S %p%n"
-
-#~ msgid "%H:%M:%S%n"
-#~ msgstr "%H:%M:%S%n"
-
-#~ msgid "%I:%M %p%n"
-#~ msgstr "%I:%M %p%n"
-
-#~ msgid "%H:%M%n"
-#~ msgstr "%H:%M%n"
-
-#~ msgid ""
-#~ "Cannot open the HTML file:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "HTML-tiedostoa ei voitu avata:\n"
-#~ "%s"
-
-#~ msgid "Select a service"
-#~ msgstr "Valitse palvelu"
-
-#~ msgid "Run %s"
-#~ msgstr "Suorita %s"
-
-#~ msgid "Close %s"
-#~ msgstr "Sulje %s"
-
-#~ msgid "Move %s to the left"
-#~ msgstr "Siirrä %s vasemmalle"
-
-#~ msgid "Move %s to the right"
-#~ msgstr "Siirrä %s oikealle"
-
-#~ msgid "Move %s into the previous row"
-#~ msgstr "Siirrä %s edelliselle riville"
-
-#~ msgid "Move %s into the next row"
-#~ msgstr "Siirrä %s seuraavalle riville"
-
-#~ msgid "Appearance"
-#~ msgstr "Ulkonäkö"
-
-#~ msgid "Background:"
-#~ msgstr "Tausta:"
-
-#~ msgid "Test bonobo service"
-#~ msgstr "Testaa bonobo-palvelua"
-
-#~ msgid "Test service"
-#~ msgstr "Testaa palvelua"
-
-#~ msgid "Update automatically"
-#~ msgstr "Päivitä automaattisesti"
-
-#~ msgid "Forward to Address"
-#~ msgstr "Välitä osoitteeseen"
-
-#~ msgid "Copying messages"
-#~ msgstr "Kopioidaan viestejä"
-
-#~ msgid "Search \"%s\""
-#~ msgstr "Etsi \"%s\""
-
-#~ msgid "[%s] (forwarded message)"
-#~ msgstr "[%s] (välitetty viesti)"
-
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Välitetty viesti (ei aihetta)"
-
-#~ msgid "Print the selected message"
-#~ msgstr "Tulosta valittu viesti"
-
-#~ msgid "Activate"
-#~ msgstr "Aktivoi"
-
-#~ msgid "Find"
-#~ msgstr "Etsi"
-
-#~ msgid "Find a contact"
-#~ msgstr "Etsi kontakti"
-
-#~ msgid "View All"
-#~ msgstr "Näytä kaikki"
-
-#~ msgid "View all contacts"
-#~ msgstr "Näytä kaikki kontaktit"
-
-#~ msgid "5 Days"
-#~ msgstr "5 päivää"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Luo uusi kalenteri"
-
-#~ msgid "Day"
-#~ msgstr "Päivä"
-
-#~ msgid "Open Calendar"
-#~ msgstr "Avaa kalenteri"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "_Avaa kalenteri"
-
-#~ msgid "About this application"
-#~ msgstr "Tietoja tästä sovelluksesta"
-
-#~ msgid "About..."
-#~ msgstr "Tietoja..."
-
-#~ msgid "Actio_ns"
-#~ msgstr "T_oiminnot"
-
-#~ msgid "Address _Book... (FIXME)"
-#~ msgstr "_Osoitekirja..."
-
-#~ msgid "Cop_y to Folder... (FIXME)"
-#~ msgstr "Kopioi kansioon..."
-
-#~ msgid "Go to the next item"
-#~ msgstr "Siirry seuraavaan kohtaan"
-
-#~ msgid "Go to the previous item"
-#~ msgstr "Siirry edelliseen kohtaan"
-
-#~ msgid "N_ext"
-#~ msgstr "_Seuraava"
-
-#~ msgid "Pre_vious"
-#~ msgstr "_Edellinen"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "Tulost_usasetukset"
-
-#~ msgid "Select everything"
-#~ msgstr "Merkitsee kaikki valituksi"
-
-#~ msgid "_About..."
-#~ msgstr "_Tietoja..."
-
-#~ msgid "_Move to Folder... (FIXME)"
-#~ msgstr "_Siirrä kansioon..."
-
-#~ msgid "Add Service"
-#~ msgstr "Lisää palvelu"
-
-#~ msgid "Create a new email"
-#~ msgstr "Luo uusi sähköposti"
-
-#~ msgid "Configure Folder..."
-#~ msgstr "Kansion asetukset..."
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Kopioi viesti uuteen kansioon"
-
-#~ msgid "Edit the current message"
-#~ msgstr "Muokkaa valittua viestiä"
-
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Piilota poistetut viestit"
-
-#~ msgid "Mark As Read"
-#~ msgstr "Merkitse luetuksi"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Merkitse luke_mattomaksi"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "Siirrä viesti uuteen kansioon"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Tulostuksen esikatselu viestistä..."
-
-#~ msgid "Print message to the printer"
-#~ msgstr "Tulosta viesti tulostimella"
-
-#~ msgid "Reply to all"
-#~ msgstr "Vastaa kaikille"
-
-#~ msgid "Reply to sender"
-#~ msgstr "Vastaa lähettäjälle"
-
-#~ msgid "S_ource"
-#~ msgstr "_Lähde"
-
-#~ msgid ""
-#~ "Send queued mail\n"
-#~ "    and retrieve new mail"
-#~ msgstr ""
-#~ "lähetä jonossa olevat viestit\n"
-#~ "    ja hae uudet viestit"
-
-#~ msgid "_Reply"
-#~ msgstr "_Vastaa"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "_Tallenna viesti nimellä..."
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "Poistettu"
 
-#~ msgid "_Threaded"
-#~ msgstr "_Säikeistys"
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "Määrittelemätön"
 
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Tallenna _kansioon..."
+#~ msgid "Task"
+#~ msgstr "Tehtävä"
 
-#~ msgid "Send the message now"
-#~ msgstr "Lähetä viesti heti"
+#~ msgid "Birthday"
+#~ msgstr "Syntymäpäivä"
 
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Liitä tekstitiedosto..."
+#~ msgid "Favorites"
+#~ msgstr "Suosikit"
 
-#~ msgid "Redo"
-#~ msgstr "Tee uudelleen"
+#~ msgid "Gifts"
+#~ msgstr "Lahjat"
 
-#~ msgid "Redo the undone action"
-#~ msgstr "Tee kumottu toiminto uudelleen"
+#~ msgid "Holiday"
+#~ msgstr "Lomapäivä"
 
-#~ msgid "Replace"
-#~ msgstr "Korvaa"
+#~ msgid "Ideas"
+#~ msgstr "Ideat"
 
-#~ msgid "Replace a string"
-#~ msgstr "Korvaa merkkijono"
+#~ msgid "Key Customer"
+#~ msgstr "Avainasiakas"
 
-#~ msgid "Reply to A_ll (FIXME)"
-#~ msgstr "Vastaa kaiki_lle"
+#~ msgid "Phone Calls"
+#~ msgstr "Puhelut"
 
-#~ msgid "Search again for the same string"
-#~ msgstr "Etsi uudelleen samaa merkkijonoa"
+#~ msgid "Strategies"
+#~ msgstr "Strategiat"
 
-#~ msgid "Search for a string"
-#~ msgstr "Etsi merkkijonoa"
+#~ msgid "VIP"
+#~ msgstr "VIP"
 
-#~ msgid "Undo"
-#~ msgstr "Kumoa"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Tapaaminen"
 
-#~ msgid "Undo the last action"
-#~ msgstr "Kumoa edellinen toiminto"
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Kontakti"
 
-#~ msgid "_Reply (FIXME)"
-#~ msgstr "_Vastaa"
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tehtävä"