[evolution/wip/gsettings] Updated Finnish translation, many corrections done with the help of pofilter from the translate tool



commit 3fb44759aefeb8ef4772bca76ebc9a24bea3350a
Author: Ville-Pekka Vainio <vpivaini cs helsinki fi>
Date:   Mon Nov 15 02:09:49 2010 +0200

    Updated Finnish translation, many corrections done with the help of pofilter from the translate toolkit

 po/fi.po |12241 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 6187 insertions(+), 6054 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 09cd5e7..21a8145 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,24 +4,26 @@
 # Sami Pesonen <sampeson iki fi> 2001-2003,
 # Ilkka Tuohela <hile iki fi> 2003-2009.
 # Timo Jyrinki <timo jyrinki iki fi> 2008.
+# Ville-Pekka Vainio <vpivaini cs helsinki fi>, 2010.
 #
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sähköpostiohjelma. Saa ehdottaa nimeä.
 #
+#: ../shell/main.c:567
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 16:57+0000\n"
-"PO-Revision-Date: 2010-09-12 10:20+0000\n"
-"Last-Translator: Heikki Mäntysaari <heikki mantysaari linux fi>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2010-11-10 19:33+0000\n"
+"PO-Revision-Date: 2010-11-15 02:07+0200\n"
+"Last-Translator: Ville-Pekka Vainio <vpivaini cs helsinki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -42,7 +44,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "Osoite \"{0}\" on jo olemassa"
+msgstr "Osoite \"{0}\" on jo olemassa."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
@@ -90,44 +92,49 @@ msgid "Delete address book '{0}'?"
 msgstr "Poista osoitekirja \"{0}\"?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "_�lä poista"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Virhe tallennettaessa {0} kohteeseen {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise-osoitekirjan luonti:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP palvelin ei vastannut kelvollisella skeematiedolla."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Jotkut ominaisuudet eivät välttämättä toimi oikein palvelimen tämänhetkisen "
 "version kanssa"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Valitsemasi kuva on suuri. Haluatko muuttaa kuvan kokoa ja tallentaa sen?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -137,15 +144,15 @@ msgstr ""
 "tätä toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy "
 "ylläpidoltasi mitkä ovat tuetut hakupohjat."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Tätä osoitekirjaa ei voi avata."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "Tällä osoitekirjapalvelimella ei ole tuettuja hakupohjia."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -153,31 +160,31 @@ msgstr ""
 "Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
 "kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Tämä osoitekirja poistetaan pysyvästi."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Tämä palvelin ei tue LDAPv3 skeematietoja."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "Osoitekirjaa ei voi avata"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Hakua ei voi suorittaa."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0} ei voi tallentaa."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -185,7 +192,7 @@ msgstr ""
 "Yrität siirtää yhteystietoa osoitekirjasta toiseen, mutta sitä ei voi "
 "poistaa lähteestä. Haluatko sen sijaan tallentaa kopion?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -195,75 +202,51 @@ msgstr ""
 "kohdata ongelmia Evolutionin käytössä. Parhaiden tulosten saamiseksi tulisi "
 "palvelin päivittää tuettuun versioon"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Oikeutesi eivät riitä yhteystietojen poistamiseen tästä osoitekirjasta."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Olet tehnyt muutoksia tähän yhteystietoon. Haluatko tallentaa muutoksesi?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Yhteystietoja {0} ei voi käyttää ennen kuin Evolution käynnistetään "
 "uudestaan."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
-msgstr "Hylkää"
+msgstr "_Hylkää"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "�_lä tallenna"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "_Muuta kokoa"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "Käytä _sellaisenaan"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Synkronoinnin oletusosoite:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Osoitekirjaa ei voitu ladata"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voi lukea"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1992
+#: ../calendar/gui/e-calendar-view.c:2024
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
@@ -274,356 +257,303 @@ msgstr "Vuosipäivä"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1991 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../calendar/gui/e-calendar-view.c:2023 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:132
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2581
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Sähköposti"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Vapaa/Varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Koti"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Kotisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Kuva"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Postitusosoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "Other"
 msgstr "Muut"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
-msgstr ""
+msgstr "Web-osoitteet"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr ""
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "Web addresses"
-msgstr ""
+msgstr "Web-osoitteet"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "_Näytä nimellä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "_Vapaa/varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "_Osavaltio/lääni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sähköpostit _HTML-muodossa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Web Log:"
-msgstr "_Web-lokin osoite:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Missä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nimi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:530
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Muokattava"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Lähdekirja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Kohdekirja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Uusi yhteystieto"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Muokattavat kentät"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Vaaditut kentät"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Muutettu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2984
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2985
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -631,56 +561,46 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3262
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3295
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3309
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-window.c:758
-msgid "Shell"
-msgstr "Tulkki"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-window.c:759
-msgid "The EShell singleton"
-msgstr "EShell-yksikkö"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Tr."
@@ -747,7 +667,7 @@ msgid "_Suffix:"
 msgstr "_Pääte:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
@@ -764,7 +684,7 @@ msgid "_List name:"
 msgstr "_Listan nimi:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "_Valitse..."
 
@@ -772,39 +692,27 @@ msgstr "_Valitse..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:520
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Kirja"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Uusi lista"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Muutettu yhteystieto:"
@@ -843,134 +751,111 @@ msgstr ""
 "Haluatko lisätä joka tapauksessa?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Yhdistä yhteystieto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:315
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanäkymää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:540
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Kysely"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:714
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "Haku keskeytettiin"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Malli"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Kuorinäkymä"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Lähde"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1282
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1459
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -979,11 +864,11 @@ msgstr ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää tämän yhteystiedon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1464
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "�_lä näytä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -1017,7 +902,7 @@ msgid "Car Phone"
 msgstr "Autopuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1118,7 +1003,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rooli"
@@ -1143,7 +1028,6 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:951
 msgid "Title"
 msgstr "Titteli"
 
@@ -1155,59 +1039,7 @@ msgstr "Yksikkö"
 msgid "Web Site"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Leveys"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Korkeus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "On kohdistettu"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Kenttä"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Kentän nimi"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Tekstimalli"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Kentän maksimipituus"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Sarakkeen leveys"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1217,7 +1049,7 @@ msgstr ""
 "\n"
 "Etsitään yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1227,11 +1059,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Etsi yhteystietoja.\n"
+"Etsi yhteystietoja\n"
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1245,7 +1077,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1255,7 +1087,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1265,10 +1097,6 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Sovitin"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Työsähköposti"
@@ -1278,21 +1106,13 @@ msgid "Home Email"
 msgstr "Henkilökohtainen sähköposti"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Muu sähköposti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Valittu"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "On kohdistin"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
@@ -1304,7 +1124,7 @@ msgstr "Uusi yhteystieto"
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1317,7 +1137,7 @@ msgstr "Avaa"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
-msgstr "_Yhteystietoluettelo: "
+msgstr "Yhteystietoluettelo: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
@@ -1329,20 +1149,20 @@ msgstr "Evolutionin minikortti"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
-msgstr "Kopioi sähköpostiosoite"
+msgstr "Kopioi _sähköpostiosoite"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:391
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:393
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
 
@@ -1378,22 +1198,22 @@ msgid "Video Chat"
 msgstr "Videokeskustelu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:490
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:491
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "Kalenteri"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
@@ -1421,21 +1241,19 @@ msgid "Web Log"
 msgstr "Web-loki"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:176
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:183
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:156
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Henkilökohtainen"
@@ -1452,119 +1270,13 @@ msgstr "Kotisivu"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:802
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Onnistui"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "Taustajärjestelmä käytössä"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "Lähde poissa käytöstä"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "Osoitekirjaa ei ole olemassa"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "Omaa yhteystietoa ei ole määritelty"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "Lupa evätty"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Yhteystietoa ei löytynyt"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "Yhteystiedon tunniste on jo olemassa"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "Protokolla ei ole tuettu"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "Peruutettu"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Ei voi perua"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "Todennus epäonnistui"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "Todennus vaaditaan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS ei ole käytettävissä"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "Lähdettä ei ole olemassa"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "Ei käytettävissä yhteydettömässä tilassa"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Muu virhe"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "Virheellinen palvelimen versio"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "Tunnistautumistapa ei ole tuettu"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1574,7 +1286,7 @@ msgstr ""
 "verkottomaan käyttöön tai sitä ei ole vielä ladattu yhteydettömään tilaan. "
 "Nouda osoitekirjan sisältö ollessasi verkottomassa tilassa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1583,7 +1295,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1591,7 +1303,7 @@ msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1599,11 +1311,11 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
 "palvelinta ei voi tavoittaa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "Yksityiskohtainen virheviesti:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1615,7 +1327,7 @@ msgstr ""
 "Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1623,48 +1335,55 @@ msgid ""
 "preferences for this address book."
 msgstr ""
 "Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen asetuksissa\n"
-"annettu aikaraja. Tarkenna hakuasi, tai pidennä palvelimen aikarajaa tämän "
+"annettu aikaraja. Tarkenna hakuasi, tai pidennä palvelimen aikarajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "Tämän osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Tämän osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
-"Tämän osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
+"Tämän osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä. "
+"%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "Kyselyä ei voitu suorittaa onnistuneesti."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Kyselyä ei voitu suorittaa onnistuneesti. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
@@ -1672,54 +1391,61 @@ msgstr "Kopioi yhteystiedot"
 msgid "Card View"
 msgstr "Korttinäkymä"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:262
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:565
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:566
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "Sivu %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1734,31 +1460,31 @@ msgstr "Luetteloa osoitekirjoista ei löytynyt"
 msgid "failed to open book"
 msgstr "Kirjaa ei voi avata"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "TULOSTIEDOSTO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Näytä paikalliset osoitekirjakansiot"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Nämä kortit vcard- tai cvs-tiedostoina"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|cvs]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "Vie asynkronisesti"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1766,29 +1492,29 @@ msgstr ""
 "Yhden tulostiedoston sisältämien korttien lukumäärä käytettäessä "
 "asynkronista tilaa. Oletusarvo on 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "NUMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi käyttöohjeet."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "Asynkronisessa tilassa ulostulon täytyy olla tiedosto."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "Normaalitilassa kokoa ei pitäisi tarvita antaa."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "Käsittelemätön virhe"
 
@@ -1796,21 +1522,21 @@ msgstr "Käsittelemätön virhe"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:53
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1836,48 +1562,43 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"Merkityksellisen yhteenvedon lisääminen viesteihisi helpottaa vastaanottajaa "
-"ymmärtämään, mistä viestissä on kyse."
+"Merkityksellisen yhteenvedon lisääminen helpottaa ymmärtämään, mistä "
+"tapaamisessa on kyse."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa vastaanottajaa "
-"ymmärtämään, mistä tehtävässä on kyse."
+"Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa ymmärtämään, "
+"mistä tehtävässä on kyse."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information in these memos will be deleted and can not be restored."
+msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Kaikki tiedot näissä muistilapuissa poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on these tasks will be deleted and can not be restored."
+msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Kaikki tiedot näistä tehtävistä poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
@@ -1940,43 +1661,39 @@ msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 #: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
-msgstr "haluatko varmasti poistaa tämän tehtävän?"
+msgstr "Haluatko varmasti poistaa tämän tehtävän?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Haluatko varmasti tallentaa tapaamisen ilman yhteenvetoa?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Haluatko varmasti lähettää tapaamisen ilman yhteenvetoa?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Haluatko varmasti lähettää tehtävän ilman yhteenvetoa?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Haluatko varmasti tallentaa tehtävän ilman yhteenvetoa?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Kalenterilähde on yhteydettömässä tilassa."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Uutta tapahtumaa ei voi luoda"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Tapahtumaa ei voi tallentaa"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
-msgstr "Poista kalenteri \"{0}\""
+msgstr "Poistetaanko kalenteri \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "Poista tehtävälista \"{0}\""
+msgstr "Poistetaanko tehtävälista \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
@@ -2019,12 +1736,7 @@ msgstr "Virhe ladattaessa muistilappulistaa"
 msgid "Error loading task list"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Virhe palvelimella \"{0}\""
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2032,7 +1744,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "kokous on peruttu."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2040,7 +1752,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "muistilappu on poistettu."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2048,11 +1760,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "tehtävä on peruttu."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Palvelin ei vastannut."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2060,7 +1768,7 @@ msgstr ""
 "Päivitettyjen tietojen lähettäminen antaa muille mahdollisuuden pitää "
 "kalenterinsa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2068,7 +1776,7 @@ msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2076,7 +1784,7 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tapaamisen tallentaminen nyt "
 "aiheuttaa tapaamisen tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2084,97 +1792,93 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
 "aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Jotkut toiminnot eivät välttämättä toimi oikein nykyisellä palvelimella."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolutionin muistilappuosa sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutionin tehtäväkomponentti on sulkeutunut odottamatta."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Tämä kalenteri poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Tämä muistilappulista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Tämä tehtävälista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Kalenteria ei voitu ladata"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Haluatko tallentaa muutoksesi tähän muistioon?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Haluatko tallentaa muutoksesi tähän tehtävään?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Haluatko lähettää perumisilmoituksen tälle muistilapulle?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Haluatko lähettää perumisilmoituksen kaikille osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Haluatko lähettää kokouskutsuja osallistujille?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Halutako lähettää päivitetyn tehtävätiedon osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2184,123 +1888,77 @@ msgstr ""
 "kohdata ongelmia Evolutionin käytössä. Parhaiden tulosten saamiseksi tulisi "
 "palvelin päivittää tuettuun versioon."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Olet muuttanut tätä tapaamista, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Olet tehnyt tallentamattomia muutoksia tähän tapaamiseen."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "Olet muuttanut tätä tehtävää, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Olet muuttanut tätä muistiota, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenterisi eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Lähetä"
 
 # calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16 #: calendar/calendar-errors.xml.h:26
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Jaa usean päivän tapahtumat:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Pilotin kalenterin ohjelmalohkoa ei voi lukea"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Prioriteetin oletusarvo:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi lukea"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -2315,81 +1973,72 @@ msgstr "Hylkää _kaikki"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Sijainti:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
-msgstr "Torkkumisaika:"
+msgstr "Torkkumis_aika:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "_Hylkää"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1031
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1644
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_Torku"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "tuntia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
-msgstr "Ei yhteenvetoa saatavilla"
+msgstr "Ei yhteenvetoa saatavilla."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
-msgstr "Ei kuvausta saatavilla"
+msgstr "Ei kuvausta saatavilla."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
-msgstr "Ei sijaintitietoja saatavilla"
+msgstr "Ei sijaintitietoja saatavilla."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1516
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2401,7 +2050,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2418,9 +2067,9 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
-msgstr "�lä kysy tästä ohjelmasta enää uudestaan"
+msgstr "�lä kysy tästä ohjelmasta enää uudestaan."
 
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
@@ -2460,14 +2109,13 @@ msgid "Alarm programs"
 msgstr "Hälytysohjelmat"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
-msgid ""
-"Amount of time in seconds the error should be shown on the status bar."
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Aika sekunteina, kuinka pitkään virheet näytetään tilarivillä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Ask for confirmation when deleting items"
-msgstr "Pyydä _vahvistusta poistettaessa"
+msgstr "Pyydä vahvistusta poistettaessa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
@@ -2485,11 +2133,11 @@ msgstr "Kalenterit, joille suoritetaan hälytyksiä"
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
-"Väri, jolla Marcus Bains-viiva piirretään aikajanassa (tyhjä oletuksena)."
+"Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Marcus Bains-viivan väri päivänäkymässä."
+msgstr "Marcus Bains -viivan väri päivänäkymässä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
@@ -2502,7 +2150,7 @@ msgstr "Varmista siivottaessa poistetut lopullisesti"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
-"Uuden tapahtuman toistumiskertojen oletusmäärä - 1 tarkoittaa ikuisesti."
+"Uuden tapahtuman toistumiskertojen oletusmäärä. -1 tarkoittaa ikuisesti."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
@@ -2538,11 +2186,11 @@ msgstr "Tapahtuman läpinäkyvyys"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
-msgstr "Vapaa/varattu palvelinten URLit"
+msgstr "Vapaa/varattu-palvelinten osoitteet"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
-msgstr "Vapaa/varattu-mallin URL"
+msgstr "Vapaa/varattu-mallin osoite"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
@@ -2589,9 +2237,9 @@ msgid "Last alarm time"
 msgstr "Viimeisen hälytyksen aika"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
-msgstr "Taso, jonka jälkeen viesti lokitetaan."
+msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
@@ -2599,19 +2247,19 @@ msgstr "Luettelo äskettäin valituista toissijaisista aikavyöhykkeistä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
-msgstr "Osoitteet URLeista, joissa julkaistaan vapaa/varattu tietoja."
+msgstr "Luettelo osoitteista, joissa julkaistaan vapaa/varattu tietoja."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
-msgstr "Marcus Bains-viiva"
+msgstr "Marcus Bains -viiva"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains-viivan väri - päivänäkymä"
+msgstr "Marcus Bains -viivan väri - päivänäkymä"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains-viivan väri - aikajana"
+msgstr "Marcus Bains -viivan väri - aikajana"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
@@ -2627,7 +2275,7 @@ msgstr "Kuinka monta äskettäin valittua aikavyöhykettä muistetaan."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
-msgstr "Muistilappujen asetttelutyyli"
+msgstr "Muistilappujen asettelutyyli"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
@@ -2643,11 +2291,11 @@ msgstr "Minuutti, jona työpäivä loppuu, väliltä 0-59."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59"
+msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
-msgstr "Kuukausinäkymän vaakapanelin sijainti"
+msgstr "Kuukausinäkymän vaakapaneelin sijainti"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
@@ -2671,7 +2319,7 @@ msgid ""
 "task list when not in the month view, in pixels."
 msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
-"välissä jos ei olla kuukausinäkymässä"
+"välissä jos ei olla kuukausinäkymässä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
@@ -2679,7 +2327,7 @@ msgid ""
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan "
-"välissä käytettäessä kuukausinäkymää"
+"välissä käytettäessä kuukausinäkymää."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
@@ -2707,7 +2355,7 @@ msgid ""
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "Pystypaneelin sijainti pikseleinä, näkymän ja kalenteriselaimen sekä "
-"tehtävälistan välissä käytettäessä kuukausinäkymää"
+"tehtävälistan välissä käytettäessä kuukausinäkymää."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
@@ -2715,7 +2363,7 @@ msgid ""
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 "Pystypaneelin sijainti pikseleinä, näkymän ja kalenteriselaimen sekä "
-"tehtävälistan välissä kun ei käytetä kuukausinäkymää"
+"tehtävälistan välissä kun ei käytetä kuukausinäkymää."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
@@ -2819,7 +2467,7 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"URL-malli, jota käytetään vapaa/varattu tiedon varaosoitteena. %u korvataan "
+"URL-malli, jota käytetään vapaa/varattu-tiedon varaosoitteena. %u korvataan "
 "sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
@@ -2828,8 +2476,8 @@ msgid ""
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 "Oletusaikavyöhyke käytettävissä päivämäärissä ja kalenterissa, muodossa "
-"kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi "
-"\"Finland/Helsinki\"."
+"kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
+"Helsinki\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -2854,8 +2502,8 @@ msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1\" "
-"(varoitukset) tai \"2\" (vianetsintäviestit)."
+"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), "
+"\"1\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
@@ -2863,7 +2511,7 @@ msgstr "Aikajaot"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
-msgstr "Viimeisimmän hälytyksen suoritusaika, time_t yksikkönä"
+msgstr "Viimeisimmän hälytyksen suoritusaika, time_t-yksikkönä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
@@ -2875,7 +2523,7 @@ msgid ""
 "(transparent) and 1 (opaque)."
 msgstr ""
 "Tapahtumien läpinäkyvyys kalenterinäkymissä. Arvo on väliltä 0 (läpinäkyvä) "
-"ja 1 (peittävä)"
+"ja 1 (peittävä)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
@@ -2901,16 +2549,15 @@ msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot "
-"\"minutes\", \"hours\" tai \"days\"."
+"Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes"
+"\", \"hours\" tai \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Käytä järjestelmän aikavyöhykettä"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid ""
-"Use the system timezone instead of the timezone selected in Evolution."
+msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
@@ -2923,7 +2570,7 @@ msgstr "Viikon alku"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)"
+msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
@@ -2934,9 +2581,8 @@ msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista tai tehtävää."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid ""
-"Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä"
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Kysytäänkö vahvistusta siivottaessa tapaamisia tai tehtäviä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
@@ -2947,14 +2593,13 @@ msgstr ""
 "sunnuntain yhden viikonpäivän kokoisiksi."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to display the end time of events in the week and month views."
+msgid "Whether to display the end time of events in the week and month views."
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Piirretäänkö Marcus Bains-viiva (viiva nykyhetkessä) kalenteriin."
+msgstr "Piirretäänkö Marcus Bains -viiva (viiva nykyhetkessä) kalenteriin."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
@@ -2984,13 +2629,12 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
+msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa."
+msgstr "Näytetäänkö kello 24 tunnin vai am/pm-muodossa."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -3071,17 +2715,17 @@ msgid "Classification"
 msgstr "Luokittelu"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:510 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:535 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Kuvaus"
@@ -3102,7 +2746,7 @@ msgid "Exist"
 msgstr "On olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3112,28 +2756,29 @@ msgstr "Sijainti"
 #: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
-msgstr "Järjestäjä:"
+msgstr "Järjestäjä"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:508 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:533 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-cal-model.c:506
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-cal-model.c:531
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Julkinen"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:311
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3195,8 +2840,9 @@ msgid "Add Alarm"
 msgstr "Lisää hälytys"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
-msgstr ""
+msgstr "Hälytys"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
@@ -3210,13 +2856,13 @@ msgstr "Oma _hälytysääni"
 msgid "Mes_sage:"
 msgstr "_Viesti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "Asetukset"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
-msgstr ""
+msgstr "Toista"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
@@ -3251,17 +2897,15 @@ msgid "before"
 msgstr "ennen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
-msgstr "päivä"
+msgstr "päivä(ä)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:37
 msgid "days"
 msgstr "päivä"
 
@@ -3269,19 +2913,20 @@ msgstr "päivä"
 msgid "end of appointment"
 msgstr "tapaamisen päättymistä"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ylimääräistä kertaa joka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minuutti(a)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "tapaamisen alkua"
 
@@ -3295,7 +2940,7 @@ msgstr "_Lisää"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "Hälytykset"
 
@@ -3306,11 +2951,11 @@ msgstr "Hälytykset"
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Valitse..."
 
@@ -3319,12 +2964,12 @@ msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Time and date:"
-msgstr "Päiväys ja aika:"
+msgid "Ti_me and date:"
+msgstr "_Päiväys ja aika:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-msgid "Date only:"
-msgstr "Vain päiväys:"
+msgid "_Date only:"
+msgstr "_Vain päiväys:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3337,7 +2982,7 @@ msgstr "(Näytetään päivänäkymässä)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
 msgid "05 minutes"
-msgstr ""
+msgstr "5 minuuttia"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
 msgid "10 minutes"
@@ -3355,13 +3000,13 @@ msgstr "30 minuuttia"
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Hälytykset"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
@@ -3375,7 +3020,7 @@ msgstr "Päivää"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
 msgid "Default Free/Busy Server"
-msgstr ""
+msgstr "Oletus-vapaa/varattu-palvelin"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
@@ -3386,20 +3031,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Näytä hälytykset vain _ilmoitusalueella"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Perjantai"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:2680
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Yleiset"
 
@@ -3412,13 +3057,13 @@ msgid "Minutes"
 msgstr "Minuuttia"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Maanantai"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "Valitse väri"
 
@@ -3428,7 +3073,7 @@ msgid "S_un"
 msgstr "_Su"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lauantai"
@@ -3448,7 +3093,7 @@ msgstr "Valitse kalenterit, joiden hälytykset lähetetään"
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
-msgstr "Näytä muistutus"
+msgstr "_Näytä muistutus"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
@@ -3460,7 +3105,7 @@ msgid "Show week _numbers"
 msgstr "Näytä viikko_numerot"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sunnuntai"
@@ -3475,7 +3120,7 @@ msgid "T_hu"
 msgstr "_To"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Tehtävälista"
 
@@ -3484,28 +3129,28 @@ msgid "Template:"
 msgstr "Pohja:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torstai"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
+#: ../widgets/misc/e-dateedit.c:595
 msgid "Time"
 msgstr "Aika"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
-msgstr "Aikavyöhyke:"
+msgstr "Aika_vyöhyke:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tiistai"
@@ -3515,7 +3160,7 @@ msgid "Use s_ystem time zone"
 msgstr "Näytä _järjestelmän aikavyöhyke"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Keskiviikko"
@@ -3523,10 +3168,10 @@ msgstr "Keskiviikko"
 #. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
-msgstr "Viikon ensimmäinen päivä:"
+msgstr "_Viikon ensimmäinen päivä:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
-#: ../modules/calendar/e-cal-shell-view-actions.c:1597
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Työviikko"
 
@@ -3610,15 +3255,15 @@ msgid "Type:"
 msgstr "Tyyppi:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -3634,35 +3279,35 @@ msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käytt
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Vä_ri:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Muistilappulista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
@@ -3702,8 +3347,7 @@ msgstr "Muistilappua on muutettu."
 
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
-msgid ""
-"%s  You have made changes. Forget those changes and update the editor?"
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
@@ -3716,248 +3360,237 @@ msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " - "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Valmis "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (erääntyy "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Erääntyy "
-
-#: ../calendar/gui/dialogs/comp-editor.c:252
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "Liitteitä ei voitu tallentaa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:521
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:635
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:658
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "Säilytä alkuperäinen?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "Sulje nykyinen ikkuna napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:961 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1483
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:403 ../widgets/misc/e-web-view.c:1027
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1490
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1021
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-#: ../shell/e-shell-window-actions.c:1497
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "Napsauta tästä näyttääksesi ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1532
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1033
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "Tallenna nykyinen ikkuna napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1602
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1038 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1651
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../shell/e-shell-window-actions.c:1658
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
-#: ../composer/e-composer-actions.c:312
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1693
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
-#: ../composer/e-composer-actions.c:240
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "Liitä tiedosta napsauttamalla tästä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Viimeisimmät _asiakirjat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1710
-#: ../composer/e-composer-actions.c:428
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2049
-#: ../calendar/gui/dialogs/comp-editor.c:2098
-#: ../calendar/gui/dialogs/comp-editor.c:3040
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3008
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3070
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
@@ -3977,53 +3610,73 @@ msgstr "Kohde on vain luettavissa"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "Tapahtumaa ei voi poistaa corba-virheen takia"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Poista kommentti"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "Tehtävää ei voi poistaa corba-virheen takia"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "Tapahtumaa ei voi poistaa dbus-virheen takia: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "Muistilappua ei voi poistaa corba-virheen takia"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "Tehtävää ei voi poistaa dbus-virheen takia: %s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "Kohdetta ei voi poistaa corba-virheen takia"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "Muistilappua ei voi poistaa dbus-virheen takia: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "Kohdetta ei voi poistaa dbus-virheen takia: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "Tapahtumaa ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tehtävää ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Muistilappua ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "Kohdetta ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "Tapahtumaa ei voi poistaa virheen takia"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "Tapahtumaa ei voi poistaa virheen takia: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "Tehtävää ei voi poistaa virheen takia"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "Tehtävää ei voi poistaa virheen takia: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "Muistilappua ei voi poistaa virheen takia"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "Muistilappua ei voi poistaa virheen takia: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "Kohdetta ei voi poistaa virheen takia"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "Kohdetta ei voi poistaa virheen takia: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -4037,149 +3690,151 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "_Hälytykset"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Napsauta tästä, jos haluat asettaa tai poistaa tämän tehtävän hälytyksiä"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:231
-#: ../calendar/gui/dialogs/event-editor.c:329
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "T_oistuvuus"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "Muuta tämä tapahtuma toistuvaksi"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "Lisää erityisiä lähetysvaihtoehtoja"
 
-#: ../calendar/gui/dialogs/event-editor.c:248
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:259
-#: ../calendar/gui/dialogs/event-editor.c:341
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "_Vapaa/Varattu"
 
-#: ../calendar/gui/dialogs/event-editor.c:261
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/dialogs/event-editor.c:308
-msgid "Appoint_ment"
-msgstr "Tapaa_minen"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2674
+msgid "Appointment"
+msgstr "Tapaaminen"
 
-#: ../calendar/gui/dialogs/event-editor.c:346
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Alarm"
-msgstr "_Hälytys"
+#: ../calendar/gui/dialogs/event-editor.c:387
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Osanottajat"
+
+#: ../calendar/gui/dialogs/event-editor.c:580
+msgid "Print this event"
+msgstr "Tulosta tämä tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:369
-msgid "Attendee_s"
-msgstr "Osallistujat"
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "Tapahtuman aloitusaika on mennyt"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr ""
-"Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
+msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Tapahtumaa ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Tapahtumassa on hälytyksiä"
 
-#: ../calendar/gui/dialogs/event-page.c:834
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:883
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:1098
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1101
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../calendar/gui/dialogs/event-page.c:1272
-#: ../calendar/gui/dialogs/memo-page.c:658
-#: ../calendar/gui/dialogs/task-page.c:864
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1282
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1312
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1474
-#: ../calendar/gui/dialogs/memo-page.c:699
-#: ../calendar/gui/dialogs/task-page.c:924
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
-msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
+msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä."
 
-#: ../calendar/gui/dialogs/event-page.c:1480
-#: ../calendar/gui/dialogs/memo-page.c:705
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/task-page.c:954
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Kalenteria \"%s\" ei voi avata"
+msgstr "Kalenteria \"%s\" ei voi avata."
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -4187,128 +3842,143 @@ msgstr "Kalenteria \"%s\" ei voi avata"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:916
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Toimit henkilön %s puolesta"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päivä ennen tapaamista"
 msgstr[1] "%d päivää ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Muokkaa"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ei hälytystä"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-msgid "1 day before appointment"
-msgstr "Yksi päivä ennen tapaamista"
-
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 hour before appointment"
-msgstr "Yksi tunti ennen tapaamista"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minuuttia ennen tapaamista"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "O_sanottajat..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "_Osanottajat..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Osanottajat"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Oma hälytys:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
-msgstr "Tapahtuman kuvaus:"
+msgstr "Tapahtuman kuvaus"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "_Yhteenveto:"
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgid "_Alarm"
+msgstr "_Hälytys"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Sijainti:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Summary:"
+msgstr "_Yhteenveto:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Aika:"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "Yksi päivä ennen tapaamista"
+
+#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "Yksi tunti ennen tapaamista"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minuuttia ennen tapaamista"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+msgctxt "eventpage"
 msgid "for"
 msgstr "kesto"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
-msgstr "kunnes"
+msgstr "saakka"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2678
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Tulosta tämä muistilappu"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "Muistilapun aloitusaika on mennyt"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain "
 "lukutilassa"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../calendar/gui/dialogs/memo-page.c:877
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:963 ../mail/em-format-html.c:2258
-#: ../mail/em-format-html.c:2317 ../mail/em-format-html.c:2341
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:81
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2299
+#: ../mail/em-format-html.c:2358 ../mail/em-format-html.c:2382
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Vastaanottaja"
 
@@ -4317,78 +3987,81 @@ msgstr "Vastaanottaja"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "_Yhteenveto:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
-msgid ""
-"You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
-"Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Vain tätä kertaa"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Tätä ja edellisiä kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Tätä ja tulevia kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Toistuvuuden päättymispäivä oli ennen tapahtuman alkua"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "Käytössä"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ensimmäinen"
 
@@ -4396,108 +4069,108 @@ msgstr "ensimmäinen"
 #. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "toinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "kolmas"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "neljäs"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "viides"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "viimeinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Toinen päiväys"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1076
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1. - 10."
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11. - 20."
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21. - 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "päivä"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
-#. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1242
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1411
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2112
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2153
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2203
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2330
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -4509,7 +4182,7 @@ msgstr "Joka"
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -4517,48 +4190,86 @@ msgstr "Esikatselu"
 msgid "This appointment rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "päivä"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "kerrat"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "kuukausi"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "kunnes"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "viikko"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "vuosi"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "Valmistumispäivä on väärin"
 
-#: ../calendar/gui/dialogs/task-details-page.c:484
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "WWW-sivu"
 
 #. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2761 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:441
 #: ../calendar/gui/e-cal-model-tasks.c:715
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
 #: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2758 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Valmis"
@@ -4566,8 +4277,8 @@ msgstr "Valmis"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1178 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Korkea"
 
@@ -4577,25 +4288,25 @@ msgstr "Korkea"
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713
 #: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "Työn alla"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1176 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Matala"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1254 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1177
-#: ../widgets/misc/e-send-options.ui.h:11
+#: ../calendar/gui/e-cal-model.c:1279 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Tavallinen"
 
@@ -4604,8 +4315,8 @@ msgstr "Tavallinen"
 #: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2752 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -4621,8 +4332,8 @@ msgstr "_Tila:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1748
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4631,8 +4342,8 @@ msgstr "Tila"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
@@ -4641,7 +4352,7 @@ msgid "_Date completed:"
 msgstr "_Valmistumispäivä:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
@@ -4649,55 +4360,63 @@ msgstr "_Prioriteetti:"
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "_Tilan yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
-msgstr ""
-"Napsauta jos haluat muuttaa tai näyttää tehtävän tilan yksityiskohtia"
+msgstr "Napsauta jos haluat muuttaa tai näyttää tehtävän tilan yksityiskohtia"
 
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "_Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/task-editor.c:323
-msgid "_Task"
-msgstr "_Tehtävä"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2676
+#: ../widgets/misc/e-send-options.c:503
+msgid "Task"
+msgstr "Tehtävä"
 
-#: ../calendar/gui/dialogs/task-editor.c:326
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "Tehtävän yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "Tulosta tämä tehtävä"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "Tehtävän aloitusaika on mennyt"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "Tehtävän aloitusaika on mennyt"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Tehtävää ei voi muokata kokonaan, koska et ole tehtävän järjestäjä"
 
-#: ../calendar/gui/dialogs/task-page.c:391
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/task-page.c:837
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1701
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "_Osanottajat..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "_Luokat..."
@@ -4784,9 +4503,9 @@ msgstr "%s %s"
 #: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
-msgstr "%s tuntemattomalle liipasintyypille"
+msgstr "%s tuntemattomalle liipaisintyypille"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -4795,7 +4514,7 @@ msgid "Categories:"
 msgstr "Luokat:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -4810,8 +4529,8 @@ msgstr "Eräpäivä:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Tila:"
 
@@ -4820,8 +4539,8 @@ msgid "Priority:"
 msgstr "Prioriteetti:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -4836,28 +4555,28 @@ msgstr "WWW-sivu:"
 msgid "Created"
 msgstr "Luotu"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Päättymispäivä"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Viimeksi muokattu"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "Varattu"
 
@@ -4877,48 +4596,42 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:829
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+#: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:326
-msgid "Default Client"
-msgstr ""
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:512 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:537 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:932
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:967 ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1256
+#: ../calendar/gui/e-cal-model.c:1281
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1258
+#: ../calendar/gui/e-cal-model.c:1283
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-model.c:2156
+#: ../calendar/gui/e-cal-model.c:2185
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
@@ -4955,97 +4668,97 @@ msgid "Start date"
 msgstr "Aloituspäivä"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:572
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:395
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:401
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../calendar/gui/e-calendar-view.c:432 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:448 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-view.c:620 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:642 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-calendar-view.c:1696
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1726
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1727
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1840 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1844 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1876 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1860 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1892 ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1891
+#: ../calendar/gui/e-calendar-view.c:1923
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -5072,7 +4785,7 @@ msgstr ""
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
-#. 
+#.
 #: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
@@ -5088,8 +4801,8 @@ msgstr "Näytä toinen aikavyöhyke"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1839
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1892
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5099,10 +4812,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1856
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1909
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5111,31 +4824,35 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1872
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1925
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 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:1072 ../calendar/gui/e-week-view.c:740
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089 ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1075 ../calendar/gui/e-week-view.c:743
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092 ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2569
+#: ../calendar/gui/e-day-view.c:2676
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Toistuva:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
@@ -5181,7 +4898,7 @@ msgstr "%s %s "
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kerran kuussa"
-msgstr[1] "kerran %d:s kuu"
+msgstr[1] "joka %d:s kuu"
 
 #: ../calendar/gui/e-itip-control.c:861
 #, c-format
@@ -5217,7 +4934,7 @@ msgstr "Päättyy"
 msgid "Due"
 msgstr "Erääntyy"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
@@ -5226,305 +4943,304 @@ msgstr "iCalendarin tiedot"
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
+"Tarkista seuraavat tiedot ja valitse toimenpide alla olevasta valikosta."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Kokous on peruttu, mutta sitä ei löytynyt kalentereistasi"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "Tehtävä on peruttu, mutta sitä ei löytynyt tehtävälistoiltasi"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
+msgid "%s has published meeting information."
+msgstr "%s on julkaissut tapaamistietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s pyytää %s läsnäoloa tapaamisessa."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> pyytää läsnäoloasi kokouksessa."
+msgid "%s requests your presence at a meeting."
+msgstr "%s pyytää läsnäoloasi kokouksessa."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> toivoo liittämistään olemassaolevaan kokoukseen."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s toivoo liittämistään olemassa olevaan kokoukseen."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivityspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
+msgid "%s has replied to a meeting request."
+msgstr "%s on vastannut tapaamispyyntöön."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Vastaus kokouspyyntöön"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> perui kokouksen."
+msgid "%s has canceled a meeting."
+msgstr "%s perui kokouksen."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Kokouksen peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> lähetti järjettömän viestin."
+msgid "%s has sent an unintelligible message."
+msgstr "%s lähetti järjettömän viestin."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
+msgid "%s has published task information."
+msgstr "%s on julkaissut tehtävätietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
+msgid "%s requests %s to perform a task."
+msgstr "%s pyytää %s tekemään tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> pyytää sinua suorittamaan tehtävän."
+msgid "%s requests you perform a task."
+msgstr "%s pyytää sinua tekemään tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Tehtäväehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s toivoo lisäystään olemassa olevaan tehtävään."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> on vastannut työtehtävän antoon."
+msgid "%s has replied to a task assignment."
+msgstr "%s on vastannut työtehtävän antoon."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> perui tehtävän."
+msgid "%s has canceled a task."
+msgstr "%s perui tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Tehtävän peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> on julkaissut vapaa/varattu-tietonsa."
+msgid "%s has published free/busy information."
+msgstr "%s on julkaissut vapaa/varattu-tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
+msgid "%s requests your free/busy information."
+msgstr "%s pyytää sinun vapaa/varattu -tietojasi."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustelu"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
+msgid "%s has replied to a free/busy request."
+msgstr "%s on vastannut vapaa/varattu-kyselyyn."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
-msgstr "Viesti ei näytä olevan kunnolla muotoiltu."
+msgstr "Viesti ei näytä olevan kunnolla muotoiltu"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisältää vain pyyntöjä, jotka eivät ole tuettu."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Liite ei sisällä kelvollista kalenteriviestiä"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikä sitä voi päivittää\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:1423
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
+msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Lähetetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voi lähettää!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Hyväksy alustavasti"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Hylkää"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2452
+#: ../calendar/gui/e-itip-control.c:2465
 #: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../widgets/misc/e-activity-proxy.c:300
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -5574,60 +5290,60 @@ msgstr "Resurssit"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1010 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:836
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
@@ -5638,7 +5354,7 @@ msgstr "Työn alla"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2309
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5647,7 +5363,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2340
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5657,67 +5373,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
-msgid "A_ttendees..."
-msgstr "_Osanottajat..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Näytä _etäämpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:643
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:661
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:676
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:693
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:702
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:711
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:719
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
@@ -5745,45 +5457,47 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "Jäsen"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:463
+#: ../calendar/gui/e-memo-table.c:414
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "Alkaa: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:565
+#: ../calendar/gui/e-memo-table.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:736
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -5791,142 +5505,107 @@ msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:424
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2113
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../modules/calendar/e-task-shell-view.c:440
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../calendar/gui/e-task-table.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:959
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Sisältää hälytyksiä."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
@@ -5935,7 +5614,7 @@ msgstr "Siirry päivään"
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nähdä ja valita nykyisen aika-alueen"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5944,14 +5623,14 @@ msgstr[1] "%d tapahtumaa."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Ei tapahtumia."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Työviikon näkymä: %s. %s"
@@ -5959,47 +5638,47 @@ msgstr "Työviikon näkymä: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päivänäkymä: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "kalenterin näkymä työviikkoon"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
-msgstr "Kalenteri näkymä yhdelle tai useammalle päivälle"
+msgstr "Kalenterinäkymä yhdelle tai useammalle päivälle"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
-msgstr "Gnome kalenteri"
+msgstr "Gnome-kalenteri"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
@@ -6009,7 +5688,7 @@ msgstr "Hyppäyspainike"
 
 #: ../calendar/gui/ea-jump-button.c:156
 msgid "Click here, you can find more events."
-msgstr "napsauta tästä, voit löytää lisää tapahtumia."
+msgstr "Napsauta tästä, voit löytää lisää tapahtumia."
 
 #: ../calendar/gui/ea-week-view.c:157
 #, c-format
@@ -6021,15 +5700,15 @@ msgstr "Kuukausinäkymä: %s. %s"
 msgid "Week View: %s. %s"
 msgstr "Työviikko: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "kalenterin kuukausinäkymä"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/gnome-cal.c:2242
+#: ../calendar/gui/gnome-cal.c:2310
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -6082,39 +5761,40 @@ msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Syyskuu"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "Valitse _tämä päivä"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Valitse tämä päivä"
+msgid "September"
+msgstr "Syyskuu"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
-msgstr "Vähintään yksi läsnäolija on välttämätön."
+msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -6122,7 +5802,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -6131,7 +5811,7 @@ msgstr "Hyväksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -6143,7 +5823,7 @@ msgstr "Alustavasti hyväksytty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -6152,7 +5832,7 @@ msgstr "Hylätty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -6160,7 +5840,7 @@ msgstr "Valtuutettu"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -6168,7 +5848,7 @@ msgstr "Päivitetty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -6176,7 +5856,7 @@ msgstr "Peru"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -6184,227 +5864,252 @@ msgstr "Päivitä"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
+"Resurssia ei voida varata, uusi tehtävä on ristiriidassa aiemman kanssa."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "Resurssia ei voida varata, virhe: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "Ke"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "La"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "Tapaaminen"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2513
+msgid " to "
+msgstr " - "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "Tehtävä"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2521
+msgid " (Completed "
+msgstr " (Valmis "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2525
+msgid "Completed "
+msgstr "Valmis "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2533
+msgid " (Due "
+msgstr " (erääntyy "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2538
+msgid "Due "
+msgstr "Erääntyy "
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2836
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -6413,10 +6118,6 @@ msgstr "Yhteystiedot: "
 msgid "% Completed"
 msgstr "% valmiina"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Peruttu"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Kesken"
@@ -6429,45 +6130,191 @@ msgstr "on suurempi kuin"
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1837
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar tiedostot (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
-msgstr "Evolution kalenterin älykäs tuoja"
+msgstr "Evolution-kalenterin älykäs tuoja"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Kokous"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Tapahtuma"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tehtävä"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Muistilappu"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "sisältää toistuvuuksia"
+
+#: ../calendar/importers/icalendar-importer.c:946
+#, fuzzy
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "Tätä ja edellisiä kertoja"
 
-#. 
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "sisältää hälytyksiä"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "sisältää liitteitä"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Julkinen"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Henkilökohtainen"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Luottamuksellinen"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Luokittelu"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Sijainti"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Alkaa"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Erääntyy"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Päättyy"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Ryhmät"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Valmiina"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Järjestäjä"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Osanottajat"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Kuvaus"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tyyppi"
+
+#.
 #. *
 #. * This program is free software; you can redistribute it and/or
 #. * modify it under the terms of the GNU Lesser General Public
@@ -6485,12 +6332,12 @@ msgstr "Evolution kalenterin älykäs tuoja"
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
 #. *
-#. 
-#. 
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
-#. 
+#.
 #: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrikka/Abidjan"
@@ -8020,141 +7867,141 @@ msgstr "Tyyni_Valtameri/Yap"
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../composer/e-composer-actions.c:247
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:254
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../composer/e-composer-actions.c:261
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
-msgstr "Tulostuksen esikatselu"
+msgstr "Tulostuksen _esikatselu"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
-msgstr "Tallenna luonnoksena"
+msgstr "Tallenna _luonnoksena"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:290
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Salaa viesti S/MIME salausvarmenteellasi"
+msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:367
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Allekirjoita tämä viesti S/MIME allekirjoitusvarmenteellasi"
+msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
@@ -8174,80 +8021,82 @@ msgstr ""
 "Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut "
 "vastaanottajat näkevät vastaanottajia"
 
-#: ../composer/e-composer-header-table.c:962
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:975
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tästä"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../composer/e-composer-private.c:212
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "Tee viimeisin kumottu toiminto uudelleen"
 
-#: ../composer/e-composer-private.c:216
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: ../composer/e-composer-private.c:220
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: ../composer/e-composer-private.c:310
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
 msgstr "Tallenna luonnos"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:185 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:197
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "�lä _näytä tätä viestiä uudestaan."
 
-#: ../composer/e-msg-composer.c:981
+#: ../composer/e-msg-composer.c:1030
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:988
+#: ../composer/e-msg-composer.c:1042
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8255,23 +8104,16 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1379
-msgid "Unable to reconstruct message from autosave file"
-msgstr ""
-
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1690
+#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:3356
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be "
-"edited.)</b>"
+#: ../composer/e-msg-composer.c:3477
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(Muokkain sisältää viestin rungon joka ei ole tekstiä ja jota ei voi "
-"muokata)</b>"
+"(Muokkain sisältää viestin rungon joka ei ole tekstiä ja jota ei voi muokata)"
 
-#: ../composer/e-msg-composer.c:3956
+#: ../composer/e-msg-composer.c:4085
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
@@ -8281,7 +8123,7 @@ msgid ""
 "the mail to be sent without those pending attachments "
 msgstr ""
 " Joidenkin liitteiden lataus on vielä kesken. Viestin lähettäminen aiheuttaa "
-"viestin lähetyksen lähetyksen ilman näitä keskeneräisiä liitteitä "
+"viestin lähetyksen ilman näitä keskeneräisiä liitteitä "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -8291,14 +8133,12 @@ msgstr "Kaikki tilit on poistettu."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
-"Haluatko todella hylätä viestin otsikolla '{0}', vaikka muokkaat sitä?"
+msgstr "Haluatko todella hylätä viestin otsikolla '{0}', vaikka muokkaat sitä?"
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid ""
-"Because &quot;{0}&quot;, you may need to select different mail options."
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
-"&quot;{0}&quot; johtuen sinun täytyy ehkä valita eri sähköpostin asetukset."
+"&quot;{0}&quot; johtuen sinun täytyy ehkä valita eri sähköpostiasetukset."
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
@@ -8357,6 +8197,7 @@ msgstr ""
 #: ../composer/mail-composer.error.xml.h:16
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
+"Tiedosto â??{0}â?? ei ole tavallinen tiedosto eikä sitä voi lähettää viestissä."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8371,11 +8212,11 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
-msgstr "Osoitteen valinnan ohjainta ei voi aktivoida"
+msgstr "Osoitteen valinnan ohjainta ei voi aktivoida."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file n{0}' to this message."
-msgstr ""
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Et voi lisätä tiedostoa â??{0}â?? tähän viestiin."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8398,26 +8239,26 @@ msgstr "_Palauta"
 msgid "_Save Draft"
 msgstr "Tallenna _luonnos"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
-msgstr ""
+msgstr "Suorita Anjal ikkunassa"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
-msgstr ""
+msgstr "Tee Anjalista oletussähköpostiohjelma"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
-msgstr ""
+msgstr "Sen pistokkeen tunnus, johon upotetaan"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
-msgstr ""
+msgstr "pistoke"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
-msgstr ""
+msgstr "Anjal-sähköpostiohjelma"
 
 #: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
@@ -8429,7 +8270,7 @@ msgstr "Syötä sähköpostiosoitteesi."
 
 #: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
-msgstr ""
+msgstr "Antamasi sähköpostiosoite on virheellinen."
 
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your password."
@@ -8442,331 +8283,330 @@ msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:360
 #: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr ""
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "Henkilökohtaiset tiedot:"
 
-#: ../capplet/settings/mail-account-view.c:468
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../capplet/settings/mail-account-view.c:477
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../capplet/settings/mail-account-view.c:487
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr ""
-
-#: ../capplet/settings/mail-account-view.c:493
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr ""
+#: ../capplet/settings/mail-account-view.c:490
+msgid "Details:"
+msgstr "Tiedot:"
 
 #: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "Vastaanotto"
+
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "Palvelimen tyyppi:"
 
-#: ../capplet/settings/mail-account-view.c:507
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "Palvelimen osoite:"
 
-#: ../capplet/settings/mail-account-view.c:516
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../capplet/settings/mail-account-view.c:525
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
-msgstr ""
+msgstr "Käytä salausta:"
 
-#: ../capplet/settings/mail-account-view.c:530
-#: ../capplet/settings/mail-account-view.c:563
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
-msgstr ""
+msgstr "ei koskaan"
 
-#: ../capplet/settings/mail-account-view.c:542
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr ""
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "Lähetys"
 
-#: ../capplet/settings/mail-account-view.c:582
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr ""
+"Sähköpostiohjelman käyttämiseksi on luotava tili. Syötä sähköpostiosoitteesi "
+"ja salasanasi alla oleviin kenttiin, niin ohjelma yrittää selvittää "
+"asetukset. Jos se ei onnistu automaattisesti, ohjelma pyytää sinulta "
+"palvelintietoja."
 
-#: ../capplet/settings/mail-account-view.c:584
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
+"Sähköpostiasetuksiasi ei saatu selville automaattisesti. Syötä asetukset "
+"alla oleviin kenttiin. Kenttiä on täytetty annettujen tietojen mukaan, mutta "
+"niitä on ehkä muutettava."
 
-#: ../capplet/settings/mail-account-view.c:586
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
-msgstr ""
+msgstr "Voit määritellä tilin lisävalintoja."
 
-#: ../capplet/settings/mail-account-view.c:588
+#: ../capplet/settings/mail-account-view.c:597
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr ""
+"Nyt tarvitaan sähköpostin lähetysasetukset. Ohjelma on tehnyt arvauksia "
+"niistä, mutta ne kannattaa tarkistaa."
 
-#: ../capplet/settings/mail-account-view.c:589
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
-msgstr ""
+msgstr "Voit määritellä tilin oletusasetukset."
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr ""
+"Tarkista vielä asetukset ennen kuin yritämme yhdistää palvelimelle ja noutaa "
+"sähköpostisi."
 
-#: ../capplet/settings/mail-account-view.c:605
-#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2180
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../capplet/settings/mail-account-view.c:605
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
-msgstr ""
+msgstr "Seuraava - Sähköpostin vastaanottaminen"
 
-#: ../capplet/settings/mail-account-view.c:606
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
-msgstr ""
+msgstr "Sähköpostin vastaanottaminen"
 
-#: ../capplet/settings/mail-account-view.c:606
-#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
-msgstr ""
+msgstr "Seuraava - Sähköpostin lähettäminen"
 
-#: ../capplet/settings/mail-account-view.c:606
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
-msgstr ""
+msgstr "Edellinen - Omat tiedot"
 
-#: ../capplet/settings/mail-account-view.c:606
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
-msgstr ""
+msgstr "Seuraava - Vastaanottoasetukset"
 
-#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
-msgstr ""
+msgstr "Vastaanottoasetukset"
 
-#: ../capplet/settings/mail-account-view.c:607
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
-msgstr ""
+msgstr "Seuraava - Sähköpostin vastaanottaminen"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
-msgstr ""
+msgstr "Sähköpostin lähettäminen"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
-msgstr ""
+msgstr "Seuraava - Tarkista tili"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
-msgstr ""
+msgstr "Seuraava - Oletukset"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
-msgstr ""
+msgstr "Edellinen - Vastaanottoasetukset"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../mail/em-account-editor.c:2760 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
-msgstr ""
+msgstr "Edellinen - Sähköpostin lähettäminen"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
-msgstr ""
+msgstr "Tarkista tili"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "Valmis"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
-msgstr ""
+msgstr "Edellinen - Sähköpostin lähettäminen"
 
-#: ../capplet/settings/mail-account-view.c:716
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google contacts with Evolution"
-msgstr ""
+msgstr "Ota käyttöön Googlen yhteystiedot Evolutionin kanssa"
 
-#: ../capplet/settings/mail-account-view.c:717
+#: ../capplet/settings/mail-account-view.c:727
 msgid "Setup Google calendar with Evolution"
-msgstr ""
+msgstr "Ota käyttöön Googlen kalenteri Evolutionin kanssa"
 
-#: ../capplet/settings/mail-account-view.c:722
+#: ../capplet/settings/mail-account-view.c:732
 msgid "You may need to enable IMAP access."
-msgstr ""
+msgstr "IMAP on ehkä otettava käyttöön."
 
-#: ../capplet/settings/mail-account-view.c:730
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Google-tilin asetukset:</span>"
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "Google-tilin asetukset:"
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:767
 msgid "Setup Yahoo calendar with Evolution"
-msgstr ""
+msgstr "Ota käyttöön Yahoon kalenteri Evolutionin kanssa"
 
-#: ../capplet/settings/mail-account-view.c:758
+#: ../capplet/settings/mail-account-view.c:771
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
 msgstr ""
+"Yahoon kalenterit on nimetty tapaan etunimi_sukunimi. Ohjelma on yrittänyt "
+"muodostaa kalenterin nimeä. Tarkista ja korjaa kalenterin nimi, jos se on "
+"väärä."
 
-#: ../capplet/settings/mail-account-view.c:765
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Yahoo-tilin asetukset:</span>"
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "Yahoo-tilin asetukset:"
 
-#: ../capplet/settings/mail-account-view.c:777
+#: ../capplet/settings/mail-account-view.c:792
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo-kalenterin nimi:"
 
-#: ../capplet/settings/mail-account-view.c:1019
+#: ../capplet/settings/mail-account-view.c:1061
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../capplet/settings/mail-account-view.c:1085
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:1129
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Sulje välilehti"
 
-#: ../capplet/settings/mail-account-view.c:1095
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "Ohjattu tilin luonti"
 
 #: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
-msgstr ""
+msgstr "Evolutionin sähköpostitilien apulainen"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:162 ../mail/em-folder-tree-model.c:169
-#: ../mail/em-folder-tree-model.c:171 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1660
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:122
-#: ../modules/calendar/e-cal-shell-backend.c:134
-#: ../modules/calendar/e-cal-shell-backend.c:136
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:230 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:146
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "Muokkaa"
+#, c-format
+msgid "Modify %s..."
+msgstr "Muokkaa tiliä %s..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Lisää uusi tili"
 
-#: ../capplet/settings/mail-settings-view.c:183
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr ""
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "Tilinhallinta"
 
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Asetukset"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
-msgstr ""
+msgstr "Kalenteritapahtumien ilmoitukset"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
 msgid "Evolution Alarm Notify"
-msgstr ""
+msgstr "Evolutionin hälytysilmoitukset"
 
-#: ../data/evolution.desktop.in.in.h:1
-msgid "Compose New Message"
-msgstr "Luo uusi viesti"
-
-#. Create the contacts group
-#: ../data/evolution.desktop.in.in.h:2
-#: ../modules/addressbook/e-book-shell-backend.c:377
-#: ../modules/addressbook/e-book-shell-view.c:397
-#: ../modules/calendar/e-cal-shell-backend.c:124
-#: ../modules/calendar/e-cal-shell-migrate.c:480
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: ../data/evolution.desktop.in.in.h:3 ../mail/e-mail-browser.c:827
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-sähköposti ja -kalenteri"
 
-#: ../data/evolution.desktop.in.in.h:5 ../shell/e-shell-window-actions.c:656
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
-#: ../data/evolution.desktop.in.in.h:6
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Configure email accounts"
-msgstr ""
+msgstr "Tee sähköpostitilien asetukset"
 
 #: ../data/evolution-settings.desktop.in.in.h:2
 msgid "Email Settings"
 msgstr "Sähköpostin asetukset"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (peruttu)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (valmis)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s..."
 msgstr "%s..."
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Evolutionin virhe"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Evolutionin varoitus"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:659
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisäinen virhe, tuntematonta virhettä \"%s\" pyydettiin"
@@ -8827,87 +8667,77 @@ msgstr "Länsieurooppalainen"
 msgid "Western European, New"
 msgstr "Länsieurooppalainen, uusi"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Perinteinen"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Yksinkertaistettu"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visuaali"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
-#: ../plugins/itip-formatter/itip-view.c:195
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: ../e-util/e-datetime-format.c:210
-#, c-format
-msgid "%d days from now"
-msgstr "%d päivän päästä"
-
-#: ../e-util/e-datetime-format.c:212
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:213
 #, c-format
-msgid "%d days ago"
-msgstr "%d päivää sitten"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%d päivän päästä"
+msgstr[1] "%d päivän päästä"
 
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:290 ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:309
 msgid "Use locale default"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:503
 msgid "Format:"
 msgstr "Muoto:"
 
 #: ../e-util/e-file-utils.c:136
 msgid "(Unknown Filename)"
-msgstr ""
+msgstr "(Tuntematon tiedostonimi)"
 
 #. Translators: The string value is the basename of a file.
 #: ../e-util/e-file-utils.c:140
 #, c-format
 msgid "Writing \"%s\""
-msgstr ""
+msgstr "Kirjoitetaan tiedostoa â??%sâ??"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
 #: ../e-util/e-file-utils.c:145
 #, c-format
 msgid "Writing \"%s\" to %s"
-msgstr ""
-
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Pidemmmän nimi"
-
-#: ../e-util/e-module.c:194
-msgid "Filename"
-msgstr "Tiedostonimi"
-
-#: ../e-util/e-module.c:195
-msgid "The filename of the module"
-msgstr "Moduulin nimi"
+msgstr "Kirjoitetaan tiedostoa â??%sâ?? palvelimelle â??%sâ??"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
@@ -8925,21 +8755,21 @@ msgstr "sekunnin ajan."
 
 #: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
-msgstr "Lokita viestit:"
+msgstr "Kirjoita viestit lokiin:"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
-msgstr "Lokituksen taso"
+msgstr "Lokinkirjoituksen taso"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2733
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1455
-#: ../shell/e-shell-window-actions.c:1462
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
@@ -8963,19 +8793,8 @@ msgstr "Vianetsintä"
 msgid "Error, Warnings and Debug messages"
 msgstr "Virheet, varoitukset ja vianetsintäviestit"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:475
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "käytössä"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Onko lisäosa käytössä"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "viikkoa"
@@ -8993,11 +8812,11 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Syy: \"{1}\"."
 
@@ -9017,129 +8836,134 @@ msgstr "Haluatko ylikirjoittaa?"
 msgid "File exists \"{0}\"."
 msgstr "Tiedosto \"{0}\" on jo olemassa."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../e-util/e-util.c:145
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../e-util/e-util.c:195
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-virhe: %s"
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "Kaikki virheet tästä eteenpäin näkyvät vain päätteessä."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:964
-#: ../mail/em-format-html.c:2259 ../mail/em-format-html.c:2321
-#: ../mail/em-format-html.c:2344 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/em-format-html.c:2300 ../mail/em-format-html.c:2362
+#: ../mail/em-format-html.c:2385 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:965
-#: ../mail/em-format-html.c:2260 ../mail/em-format-html.c:2325
-#: ../mail/em-format-html.c:2347 ../modules/mail/em-mailer-prefs.c:83
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2366
+#: ../mail/em-format-html.c:2388 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:966
+#: ../em-format/em-format-quote.c:414 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:84
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Aihe"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2441
-#: ../modules/mail/em-mailer-prefs.c:1132
+#: ../em-format/em-format-quote.c:425 ../mail/em-format-html.c:2482
+#: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "Postittaja"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1219
+#: ../em-format/em-format-quote.c:504 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../em-format/em-format.c:967 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:85 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../em-format/em-format.c:968 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
 
-#: ../em-format/em-format.c:969 ../modules/mail/em-mailer-prefs.c:87
+#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../em-format/em-format.c:1325
+#: ../em-format/em-format.c:1433
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../em-format/em-format.c:1380
+#: ../em-format/em-format.c:1522
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
+msgstr "S/MIME-viestin tulkitseminen epäonnistui: tuntematon virhe"
 
-#: ../em-format/em-format.c:1518 ../em-format/em-format.c:1680
+#: ../em-format/em-format.c:1681 ../em-format/em-format.c:1866
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi"
+msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi."
 
-#: ../em-format/em-format.c:1526
+#: ../em-format/em-format.c:1691
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../em-format/em-format.c:1538
+#: ../em-format/em-format.c:1708
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME-viestiä ei voitu tulkita"
 
-#: ../em-format/em-format.c:1538
+#: ../em-format/em-format.c:1709
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME-viestiä ei voitu tulkita: tuntematon virhe"
 
-#: ../em-format/em-format.c:1704
+#: ../em-format/em-format.c:1891
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../em-format/em-format.c:1712 ../em-format/em-format.c:1853
+#: ../em-format/em-format.c:1901 ../em-format/em-format.c:2061
 msgid "Error verifying signature"
 msgstr "Virhe tarkistettaessa allekirjoitusta"
 
-#: ../em-format/em-format.c:1712 ../em-format/em-format.c:1842
-#: ../em-format/em-format.c:1853
+#: ../em-format/em-format.c:1902 ../em-format/em-format.c:2049
+#: ../em-format/em-format.c:2062
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../em-format/em-format.c:1930
-msgid "Could not parse PGP message"
-msgstr "PGP-viestiä ei voitu tulkita"
+#: ../em-format/em-format.c:2149
+msgid "Could not parse PGP message: "
+msgstr "PGP-viestiä ei voitu tulkita:"
 
-#: ../em-format/em-format.c:1930
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP-viestiä ei voitu tulkita: tuntematon virhe"
+#: ../em-format/em-format.c:2155 ../mail/mail-ops.c:610
+#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
 
-#: ../filter/e-filter-datespec.c:71
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9160,169 +8984,169 @@ msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "yhden minuutin päässä"
 msgstr[1] "%d minuutin päässä"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 tunti tulevaisuudessa"
 msgstr[1] "%d tuntia tulevaisuudessa"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "yhden päivän päässä"
 msgstr[1] "%d päivän päässä"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 viikko tulevaisuudessa"
 msgstr[1] "%d viikkoa tulevaisuudessa"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "yhden kuukauden päässä"
 msgstr[1] "%d kuukauden päässä"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "yhden vuoden päässä"
 msgstr[1] "%d vuoden päässä"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi päiväys>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "Lisää _ehto"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "jos kaikki ehdot täytetään"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "jos joku ehdoista täyttyy"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "_Etsi kohteita:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:759
+#: ../filter/e-filter-rule.c:749
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:14
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "Lisää _ehto"
+
+#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
@@ -9347,7 +9171,7 @@ msgstr "Päiväys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -9385,7 +9209,7 @@ msgid ""
 "12:00am of the date specified."
 msgstr ""
 "Viestin päiväystä verrataan määritellyn päivän\n"
-" keskipäivään (klo 12:00)"
+" keskipäivään (klo 12:00)."
 
 #: ../filter/filter.ui.h:6
 msgid ""
@@ -9403,7 +9227,7 @@ msgstr ""
 "Viestin päiväystä verrataan aikaan, jolloin\n"
 "suodatus tapahtuu."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
@@ -9424,7 +9248,7 @@ msgstr "tulevaisuudessa"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -9440,44 +9264,28 @@ msgstr "määrittelemäsi aika"
 msgid "years"
 msgstr "vuotta"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1031 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../mail/e-mail-attachment-bar.c:590
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
-#: ../mail/e-mail-attachment-bar.c:591
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../mail/e-mail-browser.c:771 ../shell/e-shell-window.c:711
-msgid "Focus Tracker"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:781
-msgid "Shell Module"
-msgstr "Päätemoduli"
-
-#: ../mail/e-mail-browser.c:782 ../mail/message-list.c:2626
-msgid "The mail shell backend"
-msgstr "Sähköpostikuoren taustajärjestelmä"
-
-#: ../mail/e-mail-browser.c:792
-msgid "Show Deleted"
-msgstr "näytä poistetut"
-
-#: ../mail/e-mail-browser.c:793
-msgid "Show deleted messages"
-msgstr "Näytä poistetut viestit"
+#: ../mail/e-mail-browser.c:265
+msgid "(No Subject)"
+msgstr "(Ei aihetta)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9495,7 +9303,7 @@ msgstr "_Tästä osoitteesta"
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Otsakkeen nimi:"
 
@@ -9524,7 +9332,7 @@ msgid "_Later"
 msgstr "_Myöhemmin"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
@@ -9544,115 +9352,57 @@ msgstr ""
 msgid "Color"
 msgstr "Väri"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:712 ../mail/em-folder-tree.c:2746
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nimi"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:697 ../mail/em-folder-tree.c:2840
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:705
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:689
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:715
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:701
 msgid "Outbox"
 msgstr "Lähtevät"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:717
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:703
 msgid "Sent"
 msgstr "Lähetetyt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:708
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:692
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Tärkeä"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Tehtävää"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Myöhemmin"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Siirretään..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Siirto"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Siirretään  \"%s\":"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder '%s' to '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "Siirretään kansiota"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin sähköpostikansioiden sijainti ja rakenne on muuttunut versiosta "
-"Evolution 1.x.\n"
-"\n"
-"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage '%s': %s"
-msgstr ""
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9664,43 +9414,50 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioiden tietoja..."
 
-#: ../mail/e-mail-migrate.c:3030
+#: ../mail/e-mail-migrate.c:796
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
-msgstr ""
+msgstr "Ei voida luoda paikallisia sähköpostikansioita kohteeseen â??%sâ??: %s"
 
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, "
-"'evolution/config.xmldb' does not exist or is corrupt."
-msgstr ""
+#: ../mail/e-mail-notebook-view.c:563
+msgid "Please select a folder"
+msgstr "Valitse kansio"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:568
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "�lä kysy uudestaan"
 
-#: ../mail/e-mail-reader.c:258 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:258 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:632 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/e-mail-reader.c:632 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../mail/e-mail-reader.c:858
+#. Check buttons
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
+msgid "_Do not ask me again."
+msgstr "_�lä kysy uudestaan."
+
+#: ../mail/e-mail-reader.c:1116
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_�lä koskaan huomioi postituslistojen Reply-To-otsaketta."
+
+#: ../mail/e-mail-reader.c:1206
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -9712,575 +9469,623 @@ msgstr[1] "Tallenna viestit"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:879 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1227
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../mail/e-mail-reader.c:1137
+#: ../mail/e-mail-reader.c:1492
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1139
+#: ../mail/e-mail-reader.c:1494
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1144
+#: ../mail/e-mail-reader.c:1499
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:1146
+#: ../mail/e-mail-reader.c:1501
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1151
+#: ../mail/e-mail-reader.c:1506
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:1153
+#: ../mail/e-mail-reader.c:1508
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:1158
+#: ../mail/e-mail-reader.c:1513
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:1160
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:1165
+#: ../mail/e-mail-reader.c:1520
 msgid "Filter on Mailing _List..."
 msgstr "Suodata postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:1167
+#: ../mail/e-mail-reader.c:1522
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
 
-#: ../mail/e-mail-reader.c:1172
+#: ../mail/e-mail-reader.c:1527
 msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:1174
+#: ../mail/e-mail-reader.c:1529
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:1179
+#: ../mail/e-mail-reader.c:1534
 msgid "Filter on Se_nder..."
 msgstr "Suodata _lähettäjän mukaan..."
 
-#: ../mail/e-mail-reader.c:1181
+#: ../mail/e-mail-reader.c:1536
 msgid "Create a rule to filter messages from this sender"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
 
-#: ../mail/e-mail-reader.c:1186
+#: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:1188
+#: ../mail/e-mail-reader.c:1543
 msgid "Create a rule to filter messages with this subject"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
 
-#: ../mail/e-mail-reader.c:1193
+#: ../mail/e-mail-reader.c:1548
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:1195
+#: ../mail/e-mail-reader.c:1550
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../mail/e-mail-reader.c:1200
+#: ../mail/e-mail-reader.c:1555
 msgid "_Find in Message..."
-msgstr "Etsi viestistä..."
+msgstr "_Etsi viestistä..."
 
-#: ../mail/e-mail-reader.c:1202
+#: ../mail/e-mail-reader.c:1557
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:1207
+#: ../mail/e-mail-reader.c:1562
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:1209
+#: ../mail/e-mail-reader.c:1564
 msgid "Remove the follow-up flag from the selected messages"
-msgstr ""
+msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../mail/e-mail-reader.c:1214
+#: ../mail/e-mail-reader.c:1569
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:1216
+#: ../mail/e-mail-reader.c:1571
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr ""
+msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../mail/e-mail-reader.c:1221
+#: ../mail/e-mail-reader.c:1576
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:1223
+#: ../mail/e-mail-reader.c:1578
 msgid "Flag the selected messages for follow-up"
-msgstr ""
+msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../mail/e-mail-reader.c:1228
+#: ../mail/e-mail-reader.c:1583
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:1230 ../mail/e-mail-reader.c:1237
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/e-mail-reader.c:1235
+#: ../mail/e-mail-reader.c:1590
 msgid "Forward As _Attached"
-msgstr ""
+msgstr "Välitä _liitteenä"
 
-#: ../mail/e-mail-reader.c:1242
+#: ../mail/e-mail-reader.c:1597
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
 msgid "Forward the selected message in the body of a new message"
 msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ../mail/e-mail-reader.c:1249
+#: ../mail/e-mail-reader.c:1604
 msgid "Forward As _Inline"
-msgstr ""
+msgstr "Välitä _rungossa"
 
-#: ../mail/e-mail-reader.c:1256
+#: ../mail/e-mail-reader.c:1611
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:1263
+#: ../mail/e-mail-reader.c:1618
 msgid "Forward As _Quoted"
-msgstr ""
+msgstr "Välitä _lainattuna"
 
-#: ../mail/e-mail-reader.c:1270
+#: ../mail/e-mail-reader.c:1625
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:1272
+#: ../mail/e-mail-reader.c:1627
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:1277
+#: ../mail/e-mail-reader.c:1632
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../mail/e-mail-reader.c:1279
+#: ../mail/e-mail-reader.c:1634
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../mail/e-mail-reader.c:1284
+#: ../mail/e-mail-reader.c:1639
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:1286
+#: ../mail/e-mail-reader.c:1641
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1291
+#: ../mail/e-mail-reader.c:1646
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:1293
+#: ../mail/e-mail-reader.c:1648
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1298
+#: ../mail/e-mail-reader.c:1653
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:1300
+#: ../mail/e-mail-reader.c:1655
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:1305
+#: ../mail/e-mail-reader.c:1660
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../mail/e-mail-reader.c:1307
+#: ../mail/e-mail-reader.c:1662
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:1312
+#: ../mail/e-mail-reader.c:1667
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:1314
+#: ../mail/e-mail-reader.c:1669
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:1319
+#: ../mail/e-mail-reader.c:1674
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/e-mail-reader.c:1321
+#: ../mail/e-mail-reader.c:1676
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:1326
+#: ../mail/e-mail-reader.c:1681
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:1328
+#: ../mail/e-mail-reader.c:1683
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:1333
+#: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:1335
+#: ../mail/e-mail-reader.c:1690
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:1340
+#: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/e-mail-reader.c:1342
+#: ../mail/e-mail-reader.c:1697
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:1347
+#: ../mail/e-mail-reader.c:1702
+msgid "_Switch to Folder"
+msgstr "_Vaihda kansioon"
+
+#: ../mail/e-mail-reader.c:1704
+msgid "Display the parent folder"
+msgstr "Näytä ylemmän tason kansio"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to _next tab"
+msgstr "Siirry _seuraavaan välilehteen"
+
+#: ../mail/e-mail-reader.c:1711
+msgid "Switch to the next tab"
+msgstr "Siirry seuraavaan välilehteen"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to _previous tab"
+msgstr "Siirry _edelliseen välilehteen"
+
+#: ../mail/e-mail-reader.c:1718
+msgid "Switch to the previous tab"
+msgstr "Siirry edelliseen välilehteen"
+
+#: ../mail/e-mail-reader.c:1723
+msgid "Cl_ose current tab"
+msgstr "_Sulje nykyinen välilehti"
+
+#: ../mail/e-mail-reader.c:1725
+msgid "Close current tab"
+msgstr "Sulje nykyinen välilehti"
+
+#: ../mail/e-mail-reader.c:1730
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:1349
+#: ../mail/e-mail-reader.c:1732
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../mail/e-mail-reader.c:1354
+#: ../mail/e-mail-reader.c:1737
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:1356
+#: ../mail/e-mail-reader.c:1739
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:1361
+#: ../mail/e-mail-reader.c:1744
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1746
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../mail/e-mail-reader.c:1368
+#: ../mail/e-mail-reader.c:1751
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1370
+#: ../mail/e-mail-reader.c:1753
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1375
+#: ../mail/e-mail-reader.c:1758
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:1377
+#: ../mail/e-mail-reader.c:1760
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1765
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1767
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:1389
+#: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1391
+#: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:1398
+#: ../mail/e-mail-reader.c:1781
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:1788
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../mail/e-mail-reader.c:1410
+#: ../mail/e-mail-reader.c:1793
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1795
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:1417
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:1419
+#: ../mail/e-mail-reader.c:1802
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1809
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
 
-#: ../mail/e-mail-reader.c:1431
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1816
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../mail/e-mail-reader.c:1438
+#: ../mail/e-mail-reader.c:1821
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:1440
+#: ../mail/e-mail-reader.c:1823
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:1445
+#: ../mail/e-mail-reader.c:1828
 msgid "Search Folder from Mailing _List..."
 msgstr "Hakunäkymä _postilistasta..."
 
-#: ../mail/e-mail-reader.c:1447
+#: ../mail/e-mail-reader.c:1830
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:1835
 msgid "Search Folder from Recipien_ts..."
 msgstr "Hakunäkymä _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:1454
+#: ../mail/e-mail-reader.c:1837
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../mail/e-mail-reader.c:1459
+#: ../mail/e-mail-reader.c:1842
 msgid "Search Folder from Sen_der..."
 msgstr "Hakunäkymä _lähettäjästä..."
 
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1844
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../mail/e-mail-reader.c:1466
+#: ../mail/e-mail-reader.c:1849
 msgid "Search Folder from S_ubject..."
 msgstr "Hakunäkymä _aiheesta..."
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1851
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../mail/e-mail-reader.c:1473
+#: ../mail/e-mail-reader.c:1856
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../mail/e-mail-reader.c:1475
+#: ../mail/e-mail-reader.c:1858
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../mail/e-mail-reader.c:1487
+#: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:1489
+#: ../mail/e-mail-reader.c:1872
 msgid "Undelete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1877
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1879
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1884
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../mail/e-mail-reader.c:1503
+#: ../mail/e-mail-reader.c:1886
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1891
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
-#: ../mail/e-mail-reader.c:1510
+#: ../mail/e-mail-reader.c:1893
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:1517
+#: ../mail/e-mail-reader.c:1900
 msgid "Create R_ule"
 msgstr "Luo _sääntö"
 
-#: ../mail/e-mail-reader.c:1524
+#: ../mail/e-mail-reader.c:1907
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../mail/e-mail-reader.c:1531
+#: ../mail/e-mail-reader.c:1914
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../mail/e-mail-reader.c:1538
+#: ../mail/e-mail-reader.c:1921
+msgid "_Group Reply"
+msgstr "_Vastaa ryhmälle"
+
+#: ../mail/e-mail-reader.c:1928
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1935
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:1552
+#: ../mail/e-mail-reader.c:1942
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:1559
+#: ../mail/e-mail-reader.c:1949
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:1584
+#: ../mail/e-mail-reader.c:1974
 msgid "Mark for Follo_w Up..."
-msgstr "_Merkitse _edelleen lähetettäväksi..."
+msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1982
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/e-mail-reader.c:1596
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1600
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1994
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/e-mail-reader.c:1612
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:2038
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:1650
+#: ../mail/e-mail-reader.c:2040
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:2046
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:2048
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:2269
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voi hakea"
 
-#: ../mail/e-mail-reader.c:1884 ../mail/e-mail-reader.c:1945
-#: ../mail/mail-ops.c:1848
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1892
 #, c-format
 msgid "Retrieving message '%s'"
-msgstr ""
+msgstr "Noudetaan viestiä â??%sâ??"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2461
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:2893 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/e-mail-reader.c:2582
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3041
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:2583
+#: ../mail/e-mail-reader.c:3042
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:2628 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:3061
+msgid "Group Reply"
+msgstr "Vastaa ryhmälle"
+
+#: ../mail/e-mail-reader.c:3062
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
+
+#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:2632
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:2636
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3144
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:2640 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Vastaa"
 
+#: ../mail/e-mail-reader.c:3722
+#, c-format
+msgid "Folder '%s'"
+msgstr "Kansio â??%sâ??"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ei salausta"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:607
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisenssisopimus ohjelmalle %s"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:614
 #, c-format
 msgid ""
 "\n"
@@ -10289,39 +10094,39 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 "\n"
-"Lue tarkkaan allaoleva lisenssisopimus\n"
+"Lue tarkkaan alla oleva lisenssisopimus\n"
 "ohjelmalle %s\n"
 "ja ruksita laatikko, jos hyväksyt lisenssin\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../mail/em-account-editor.c:960
+#: ../mail/em-account-editor.c:985
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/em-account-editor.c:961
+#: ../mail/em-account-editor.c:986
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/em-account-editor.c:962
+#: ../mail/em-account-editor.c:987
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2098
 msgid "Mail Configuration"
 msgstr "Sähköpostiasetukset"
 
-#: ../mail/em-account-editor.c:2057
+#: ../mail/em-account-editor.c:2099
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10329,9 +10134,9 @@ msgid ""
 msgstr ""
 "Tervetuloa Evolutionin sähköpostitilin asetusapulaiseen.\n"
 "\n"
-"Aloita napista \"Eteenpäin\"."
+"Aloita painikkeesta \"Eteenpäin\"."
 
-#: ../mail/em-account-editor.c:2060
+#: ../mail/em-account-editor.c:2102
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10341,20 +10146,20 @@ msgstr ""
 "tiedot eivät ole pakollisia, mutta täyttämällä kyseiset kentät voit lisätä "
 "tiedot lähettämiisi sähköpostiviesteihin."
 
-#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2219
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/em-account-editor.c:2063
+#: ../mail/em-account-editor.c:2105
 msgid "Please configure the following account settings."
 msgstr "Määrittele seuraavat tiliasetukset."
 
-#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2696
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../mail/em-account-editor.c:2066
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10363,23 +10168,23 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2110
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: ../mail/em-account-editor.c:2069
+#: ../mail/em-account-editor.c:2111
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Syötä kuvaava nimi tälle tilille allaolevaan kenttään.\n"
+"Syötä kuvaava nimi tälle tilille alla olevaan kenttään.\n"
 "Tätä nimeä käytetään ainoastaan ohjelman sisäisesti tilin näyttöön."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2115
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2116
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10391,58 +10196,54 @@ msgstr ""
 "\n"
 "Voit nyt lähettää ja vastaanottaa sähköpostia Evolutionilla.\n"
 "\n"
-"Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\""
+"Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\"."
 
-#: ../mail/em-account-editor.c:2506
+#: ../mail/em-account-editor.c:2557
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/em-account-editor.c:2514
+#: ../mail/em-account-editor.c:2565
 msgid "minu_tes"
-msgstr "minuutti"
+msgstr "_minuutti"
+
+#: ../mail/em-account-editor.c:2841
+msgid "Please select a folder from the current account."
+msgstr "Valitse kansio nykyiseltä tililtä."
 
-#: ../mail/em-account-editor.c:2822 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "Turvallisuus"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2867 ../mail/em-account-editor.c:2935
+#: ../mail/em-account-editor.c:3156 ../mail/em-account-editor.c:3224
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
-#: ../mail/em-account-editor.c:2868 ../mail/em-account-editor.c:2936
+#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
 msgid "Checking for New Messages"
 msgstr "Uusien viestien etsintä"
 
-#: ../mail/em-account-editor.c:3427
-msgid "Account Editor"
-msgstr "Tilimuokkain"
-
-#: ../mail/em-account-editor.c:3427
-msgid "Evolution Account Assistant"
-msgstr "Evolutionin sähköpostitilien apulainen"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1568
+#: ../mail/em-composer-utils.c:1735
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr ""
+msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti â??%2$sâ?? on luettu."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1616
+#: ../mail/em-composer-utils.c:1783
 #, c-format
 msgid "Delivery Notification for: \"%s\""
-msgstr ""
+msgstr "Toimituskuittaus viestille: â??%sâ??"
 
-#: ../mail/em-composer-utils.c:1940
+#: ../mail/em-composer-utils.c:2192
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1987
+#: ../mail/em-composer-utils.c:2239
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10450,19 +10251,19 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:2131
+#: ../mail/em-composer-utils.c:2383
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-composer-utils.c:2315
+#: ../mail/em-composer-utils.c:2595
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:2316
+#: ../mail/em-composer-utils.c:2596
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
@@ -10551,6 +10352,10 @@ msgstr "Lähetä edelleen"
 msgid "Forward to"
 msgstr "Välitä"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Tärkeä"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "on jälkeen"
@@ -10575,7 +10380,7 @@ msgstr "ei ole asetettu"
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "Roskaposti"
 
@@ -10624,7 +10429,7 @@ msgid "Play Sound"
 msgstr "Soita ääni"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Luettu"
 
@@ -10705,16 +10510,16 @@ msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "sitten"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
@@ -10722,24 +10527,24 @@ msgstr[1] "Lukemattomia viestejä:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
@@ -10747,126 +10552,109 @@ msgstr "Kansion ominaisuudet"
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
-#: ../mail/em-folder-tree-model.c:173 ../mail/em-folder-tree-model.c:175
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "Hakunäkymät"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:180 ../mail/em-folder-tree-model.c:182
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:780 ../mail/em-folder-tree-model.c:1117
+#: ../mail/em-folder-tree-model.c:767 ../mail/em-folder-tree-model.c:1114
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-tree.c:192
+#: ../mail/em-folder-tree.c:191
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:605
+#: ../mail/em-folder-tree.c:611
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#. 
-#: ../mail/em-folder-tree.c:1087
+#: ../mail/em-folder-tree.c:1100
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1321
+#: ../mail/em-folder-tree.c:1339
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:1611 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1656 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:1613 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1660 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:1620 ../mail/message-list.c:2146
+#: ../mail/em-folder-tree.c:1669 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:1622 ../mail/message-list.c:2148
+#: ../mail/em-folder-tree.c:1673 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:1637
+#: ../mail/em-folder-tree.c:1690
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
-msgstr ""
+msgstr "Siirrä kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
-msgstr ""
+msgstr "Kopioi kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:137
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Luodaan kansiota '%s'"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-utils.c:691
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Peru kansion \"%s\" tilaus"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10874,11 +10662,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10886,11 +10674,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1554
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10898,11 +10686,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1555
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10910,11 +10698,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1556
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10922,11 +10710,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10934,11 +10722,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1563
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -10948,11 +10736,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1564
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10960,11 +10748,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1565
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10974,15 +10762,15 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../mail/em-format-html-display.c:511
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10991,78 +10779,78 @@ msgstr ""
 "käsiteltäväksi.  Voit näyttää sen muotoilemattomana tai ulkoisella "
 "tekstinmuokkaimella."
 
-#: ../mail/em-format-html-display.c:740
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "Valmistui"
 
-#: ../mail/em-format-html-display.c:748
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:752
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "mennessä"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "Näytä _muotoilematon"
 
-#: ../mail/em-format-html-display.c:966
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:1023
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/em-format-html.c:166
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: ../mail/em-format-html.c:357
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "Muotoillaan viestiä..."
 
-#: ../mail/em-format-html.c:1398 ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
 msgid "Retrieving '%s'"
-msgstr ""
+msgstr "Noudetaan â??%sâ??"
 
-#: ../mail/em-format-html.c:1871
+#: ../mail/em-format-html.c:1911
 msgid "Unknown external-body part."
 msgstr "Tuntematon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:1879
+#: ../mail/em-format-html.c:1919
 msgid "Malformed external-body part."
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:1920
+#: ../mail/em-format-html.c:1960
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../mail/em-format-html.c:1922
+#: ../mail/em-format-html.c:1962
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:1943
+#: ../mail/em-format-html.c:1983
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../mail/em-format-html.c:1954
+#: ../mail/em-format-html.c:1994
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
@@ -11070,39 +10858,59 @@ msgstr ""
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#. 
-#: ../mail/em-format-html.c:2614
+#: ../mail/em-format-html.c:2657
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Tämä viesti lähetettiin <b>%s</b> käyttäjän <b>%s</b> puolesta"
+msgid "No HTML stream available"
+msgstr "HTML-virtaa ei ole saatavilla"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d message at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Haluatko varmasti avata %d viestin kerralla?"
+msgstr[1] "Haluatko varmasti avata %d viestiä kerralla?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "�lä _näytä tätä viestiä uudestaan"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:816
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
@@ -11111,7 +10919,7 @@ msgstr "Viestit %s:ltä"
 msgid "Search _Folders"
 msgstr "_Hakunäkymät"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
@@ -11152,50 +10960,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Lähetä ja vastaanota\" -ikkunan leveys"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Sallii evolutionin näyttää rajoitetun kokoiset tekstiosat"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Pyydä aina kuittaus lukemisesta"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Tunnista hymiöt automaattisesti"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
-msgstr "_Havaitse linkit automaattisesti"
+msgstr "Havaitse linkit automaattisesti"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Viesti-ikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11203,19 +11007,19 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan "
-"postipalvelimelle.  Aikavälin täytyy olla vähintään 30 sekuntia."
+"postipalvelimelle. Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11223,63 +11027,63 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
 "kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Viesti-ikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Sähköpostien selainikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Tilausikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Sähköpostien selainikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Viesti-ikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Sähköpostien selainikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Tilausikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11287,11 +11091,11 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta "
 "varten vain paikallisista osoitekirjoista"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11304,12 +11108,12 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
 "osoitekirjoista."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11319,26 +11123,30 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Määrittää käytetäänkö samaa kirjasinta sekä \"Lähettäjä\" ja "
-"\"Vastaanottaja\" riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
+"Määrittää käytetäänkö samaa kirjasinta sekä \"Lähettäjä\"- että "
+"\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "Näytä ainoastaan viestitekstit, jotka eivät ylitä tiettyä kokoa"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr ""
@@ -11357,11 +11165,11 @@ msgstr "Tyhjennä roskakorit lopetettaessa"
 
 #: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan"
+msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
 #: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan"
+msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
 #: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
@@ -11389,7 +11197,7 @@ msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
 #: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
-msgstr "ota hakunäkymät käyttöön"
+msgstr "Ota hakunäkymät käyttöön"
 
 #: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
@@ -11412,18 +11220,31 @@ msgstr ""
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Ota käyttöön viestin tekstiosan rajoitettu näyttökoko."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+#, fuzzy
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
+"esikatselussa, viestiluettelossa ja kansioluettelossa."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
-msgstr "Muotoile tiedostonimet outlookin ja gmailin tapaan."
+msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11435,19 +11256,27 @@ msgstr ""
 "UTF-8 merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, "
 "vaan käyttävät virheellistä standardia RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11455,7 +11284,7 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
 "todella tehdä sen."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11466,19 +11295,23 @@ msgstr ""
 "tyyppientietokannassa määriteltyä bonobo-komponentin katselinta viestin "
 "näyttämiseen."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11486,7 +11319,7 @@ msgstr ""
 "\"Lähetä ja vastaanota sähköpostia\"-ikkunan aloituskorkeus. Arvo muuttuu, "
 "jos käyttäjä muuttaa ikkunan korkeutta."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11494,7 +11327,7 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11502,12 +11335,12 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive "
-"Mail\" window cannot be maximized. This key exists only as an implementation "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
 "\"Lähetä ja vastaanota sähköpostia\"-ikkunan suurennustilan oletusarvo. Arvo "
@@ -11515,19 +11348,19 @@ msgstr ""
 "evolution ei käytä tätä arvoa, koska kyseinen ikkuna ei ole "
 "suurennettavissa. Avain on olemassa vain teknisten yksityiskohtien takia."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11535,7 +11368,15 @@ msgstr ""
 "\"Lähetä ja vastaanota sähköpostia\"-ikkunan aloitusleveys. Arvo muuttuu, "
 "jos käyttäjä muuttaa ikkunan leveyttä."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11544,53 +11385,79 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
+"ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
+"synkronointia yhteydettömään tilaan siirryttäessä."
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+#, fuzzy
+msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:93
+#, fuzzy
+msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr ""
-"Luettelo MIME-tyypeistä, joista etsitään bonobo-komponenttikatselimia"
+msgstr "Luettelo MIME-tyypeistä, joista etsitään Bonobo-komponenttikatselimia"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "Hyväksytyt lisenssit"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "Luettelo tileistä"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Luettelo tileistä, jotka Evolutionin sähköpostiosa tuntee. Luettelo sisältää "
-"merkkijonoja, jotka nimeävät alihakemistoja "
-"hakemiston/apps/evolution/mail/accounts alla."
+"merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
+"accounts alla."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11598,15 +11465,15 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri "
 "pareja, joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "Luettelo protokollista, joiden lisenssi on hyväksytty."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11616,109 +11483,127 @@ msgstr ""
 "koskaan lataa kuvia verkosta, \"1\" - lataa kuvat, jos lähettäjä on "
 "osoitekirjassa ja \"2\" - lataa kuvat aina verkosta."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "Postiselaimen korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "Postiselain suurennettu"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "Postiselaimen leveys"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Message text limit for display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Viestin näyttötyyli (\"normal\", \"full headers\" tai \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-"Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
+msgstr "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
-msgstr ""
-"Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
+msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Kysy vahvistus merkittäessä useita viestejä"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+msgid "Prompt when replying privately to list messages"
+msgstr "Kysy vahvistus merkittäessä useita viestejä"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+#, fuzzy
+msgid "Prompt when replying to many recipients"
+msgstr ""
+"Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11726,127 +11611,127 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
-"kenttiä"
+"kenttiä."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "Lisää oma allekirjoitus vastauksen alkuun"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "Aseta osoitin viestin loppuun vastattaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
-msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä"
+msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "Etsi lähettäjän valokuvaa paikallisista osoitekirjoista"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "Lähetä HTML-postia oletuksena."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Näytä \"From\"-kenttä lähetettäessä uutisryhmään"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
-msgstr "Näytä animoidut kuvat animaatioina"
+msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11854,7 +11739,7 @@ msgstr ""
 "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11862,7 +11747,7 @@ msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11870,7 +11755,7 @@ msgstr ""
 "Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
 "Näytä-valikosta, kun sähköpostitili on valittu."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11878,7 +11763,7 @@ msgstr ""
 "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
 "Näytä-valikosta, kun sähköpostitili on valittu."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11886,65 +11771,76 @@ msgstr ""
 "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan "
 "Näytä-valikosta, kun sähköpostitili on valittu."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa"
+msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "Oikoluvun väri"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "Oikoluvun kielet"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Text message part limit"
-msgstr "Tekstin viestiosan kokoraja"
-
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:181
+#, fuzzy
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "The last time empty trash was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:182
+#, fuzzy
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11952,31 +11848,33 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "Päätekirjasin viestejä näytettäessä."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen kirjasin viestejä näytettäessä."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1\" "
-"(varoitukset) tai \"2\" (vianetsintäviestit)."
+"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), "
+"\"1\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:187
+#, fuzzy
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "Määrittää evolutionin muotoileman viestin tekstiosan enimmäiskoon. "
 "Oletusarvo on 4096kt ja arvo määritellään kilotavuina."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11986,27 +11884,27 @@ msgstr ""
 "Jos oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä "
 "olevia lisäosia."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
-"Tämä avain luetaan kerran, ja nollataan arvoksi \"epätosi\" lukemisen "
+"Tämä avain luetaan kerran, ja nollataan arvoksi \"false\" lukemisen "
 "jälkeen.  Tämä peruu sähköpostin valinnan luettelosta ja poistaa esikatselun "
 "kansiolta."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is "
-"&lt;header enabled&gt; - set enabled if the header is to be displayed in the "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
 "Tämä avain sisältää listan XML-rakenteista, jotka määrittelevät omia "
 "otsakkeita ja sen, näytetäänkö niitä. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - määrittele enabled, jos otsake halutaan näyttää postinäkymässä."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -12016,11 +11914,11 @@ msgstr ""
 "määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
 "joille ei tehdä roskapostisuodatusta."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "Tämä ominaisuus helpottaa noudon nopeuden parantamista."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12028,7 +11926,7 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin "
 "lukumäärän, jonka jälkeen näytetään '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12036,7 +11934,7 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
 "Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12046,53 +11944,53 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Väärinkirjoitettujen sanojen alleviivauksen väri käytettäessä kirjoituksen "
 "aikaista oikolukua."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "Käytä Spamassassin-palvelinta ja -asiakasta"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Käytä Spamassassin-palvelinta ja -asiakasta (spamc/spamd)"
+msgstr "Käytä Spamassassin-palvelinta ja -asiakasta (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia kirjasimia näytettäessä viestejä."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
-msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia"
+msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -12102,7 +12000,7 @@ msgstr ""
 "vastattaessa viestiin. Tämä asetus määrittää, viedäänkö kursori viestin "
 "alkuun vai loppuun."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -12112,20 +12010,19 @@ msgstr ""
 "lisätä vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin "
 "alkuun vai loppuun."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid ""
-"Whether a read receipt request gets added to every message by default."
+#: ../mail/evolution-mail.schemas.in.h:210
+msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Lisätäänkö kaikkiin viesteihin oletuksena kuittauspyyntö."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Onko kansionimien typistys sivupalkissa poistettu käytöstä."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12133,73 +12030,93 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Järjestetäänkö säikeet säikeen viimeisen viestin mukaan"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:1011
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-tuoja"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Kohdekansio:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "_Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../mail/importers/evolution-mbox-importer.c:382
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Aihe"
+
+#: ../mail/importers/evolution-mbox-importer.c:387
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Lähettäjä"
+
+#: ../mail/importers/evolution-mbox-importer.c:431
 #: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
 msgid "Importing '%s'"
-msgstr ""
+msgstr "Tuodaan â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
@@ -12208,468 +12125,549 @@ msgstr "Tutkitaan %s"
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
-msgstr "Evolution Pine-tuoja"
+msgstr "Evolutionin Pine-tuoja"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Tuo sähköpostit Pinestä."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Huomautus: Vaatii ohjelman uudelleenkäynnistämisen)"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:451
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Suodatussääntöä â??%sâ?? on muokattu ottamaan huomioon poistettu kansio \n"
+"â??%sâ??."
+msgstr[1] ""
+"Seuraavia suodatussääntöjä\n"
+"%s on muokattu ottamaan huomioon poistettu kansio\n"
+"â??%sâ??."
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b>"
-msgstr ""
+msgid "(Not Recommended)"
+msgstr "(Ei suositella)"
 
 #: ../mail/mail-config.ui.h:3
-msgid "Account Information"
-msgstr ""
+msgid "(Note: Requires restart of the application)"
+msgstr "(Huomautus: Vaatii ohjelman uudelleenkäynnistämisen)"
 
 #: ../mail/mail-config.ui.h:4
+msgid "Account Information"
+msgstr "Tilitiedot"
+
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
-"Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
+msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Salaa myös itselle, kun lähetetään salattu viesti"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
+msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
+msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Pyydä aina vastaanoton _kuittausta"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "Käytä samoja _näkymäasetuksia kaikille kansioille"
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1020
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "Lisää _hymiöt kuvina automaattisesti"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "_Tyhjennä"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "_Tyhjennä"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
-msgstr ""
+msgstr "Viestien kirjoittaminen"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
-msgstr ""
+msgstr "Oletustoiminta"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
-msgstr ""
+msgstr "Sähköpostien poistaminen"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Allekirjoita lähtevät viestit sähköisesti (oletuksena)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr ""
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "Näytettävät viestin otsakkeet"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "�lä muotoile viestiä, jos viestin _koko on suurempi kuin"
+#: ../mail/mail-config.ui.h:40
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "�lä näytä viestiä, jos viestin _koko on suurempi kuin"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-"�lä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
+msgstr "�lä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "�lä lainaa"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "_Luonnosten kansio:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "Käytä maagista _välilyöntiä"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "Käytä _hakunäkymiä"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
-msgstr "Salaa lähtevät viestit oletuksena"
+msgstr "Salaa _lähtevät viestit oletuksena"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
-msgstr "Muotoile viestit HTML:nä"
+msgstr "Muotoile viestit _HTML:nä"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "Ryhmävastaus menee vain sähköpostilistalle, jos mahdollista"
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-välipalvelin:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "�lä huomioi postituslistojen Reply-To-otsaketta"
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "Sisäkkäisesti"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "Sisäkkäinen alkuperäisviesti (Outlookin tapaan)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "kt"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
-msgstr ""
+msgstr "Kuvien lataaminen"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
-msgstr ""
+msgstr "Viestin näyttäminen"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
-msgstr ""
+msgstr "Viestin kirjasimet"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
-msgstr ""
+msgstr "Viestin kuittaukset"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "Ei _välipalvelinta seuraaville:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Huomio: salasanaa ei kysytä ennen kuin otat ensimmäistä kertaa yhteyttä"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Valitsin ohitetaan, jos täsmäävä oma sähköpostin roskapostiotsake löydetään."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
-msgstr ""
+msgstr "Valinnaiset tiedot"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_avaimen ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG) -salaus"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
+msgstr "Tulostettavat kirjasimet"
+
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
 msgstr ""
+"Kysy vahvistus, kun sähköpostilista ohjaa yksityisen vastauksen takaisin "
+"listalle"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:92
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr ""
+"Kysy vahvistus lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
+
+#: ../mail/mail-config.ui.h:93
+msgid "Prompt when sending replies to _many recipients"
+msgstr "Kysy vahvistus lähetettäessä vastauksia _useille vastaanottajille"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "Välityspalvelimen asetukset"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
-msgstr ""
+msgstr "Pakolliset tiedot"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
-msgstr ""
+msgstr "Tämä Evolution-käännös ei tue SSL:ää"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Et_si lähettäjän valokuvaa vain paikallisista osoitekirjoista"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "_Valitse..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "_Oletuskirjasin:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
-msgstr ""
+msgstr "Suojattu MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "Valitse luonnosten kansio"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "Valitse roskapostikansio"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "Valitse lähetettyjen kansio"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "Valitse roskakorikansio"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
-msgstr ""
+msgstr "Lähettäjän valokuva"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
-msgstr ""
+msgstr "Luonnokset ja lähetetyt viestit"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
-msgstr ""
+msgstr "Palvelinasetukset"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "_Allekirjoitusalgoritmi:"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
-msgstr ""
+msgstr "A_llekirjoitukset"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "Allekirjoitus_algoritmi:"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12677,7 +12675,7 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12687,7 +12685,12 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä. "
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+msgid "Top Posting Option"
+msgstr "Top-postaus"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12695,244 +12698,262 @@ msgstr ""
 "Anna nimi, jolla haluat kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "Käytä _tunnistautumista"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
-msgstr "_Lisää allekirjoitus:"
+msgstr "_Lisää allekirjoitus"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "_Tunnistautumistapa"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
-msgstr "_Roskapostin oletuslisäosa"
+msgstr "_Roskapostin oletuslisäosa:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
-msgstr "_Suora yhteys Internettiin"
+msgstr "_Suora yhteys Internetiin"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_�lä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "_Roskapostikansio:"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "_Kielet"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "_Lataa viestin kuvat, jos yhteystieto on osoitekirjassa"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "_Välipalvelimen käsin asettaminen:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "_�lä koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus lähetettäessä viestejä tyhjällä Aihe-otsakkeella"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "_Skripti:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "_HTTPS-välipalvelin:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Palvelin:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
-msgstr "Näytä kuvien animaatiot"
+msgstr "_Näytä kuvien animaatiot"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Rajaa To-, Cc- ja Bcc-otsakkeet lukumäärään "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "_Roskakorikansio:"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Käytä salattua yhteyttä:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "Käytä järjestelmän olet_uksia"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "osoitteet"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "väri"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "kuvaus"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Pienennä _kaikki"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
-msgstr ""
+msgstr "Digitaalinen allekirjoitus"
 
 #: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "�lä välitä"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "_Laajenna kaikki"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Salaus"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Välitä"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Arvio"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "_Palvelin:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "_Näytä vain kohteet, jotka sisältävät:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12940,181 +12961,178 @@ msgstr ""
 "Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
 "Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Hyväksy lisenssi"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Erääntyy:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Merkki:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../mail/mail-folder-cache.c:906
+#: ../mail/mail-folder-cache.c:782
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "Noudetaan viestejä"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:584
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../mail/mail-ops.c:596 ../mail/mail-ops.c:623
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:636
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
+"Kansioon %s lisääminen epäonnistui: %s\n"
+"Lisätään paikalliseen â??Lähetetytâ??-kansioon."
 
-#: ../mail/mail-ops.c:640
+#: ../mail/mail-ops.c:655
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
-msgstr ""
+msgstr "Paikalliseen â??Lähetetytâ??-kansioon lisääminen epäonnistui: %s"
 
-#: ../mail/mail-ops.c:751 ../mail/mail-ops.c:832
+#: ../mail/mail-ops.c:775 ../mail/mail-ops.c:867
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:783
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../mail/mail-ops.c:788
+#: ../mail/mail-ops.c:827
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "%d viestin %d:stä epäonnistui"
+msgstr "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../mail/mail-ops.c:790 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:829 ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:792 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:831 ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:904
+#: ../mail/mail-ops.c:939
 #, c-format
 msgid "Saving message to folder '%s'"
-msgstr ""
+msgstr "Tallennetaan viestiä kansioon â??%sâ??"
 
-#: ../mail/mail-ops.c:981
+#: ../mail/mail-ops.c:1019
 #, c-format
 msgid "Moving messages to '%s'"
-msgstr ""
+msgstr "Siirretään viestejä kansioon â??%sâ??"
 
-#: ../mail/mail-ops.c:981
+#: ../mail/mail-ops.c:1019
 #, c-format
 msgid "Copying messages to '%s'"
-msgstr ""
+msgstr "Kopioidaan viestejä kansioon â??%sâ??"
 
-#: ../mail/mail-ops.c:1090
+#: ../mail/mail-ops.c:1128
 #, c-format
 msgid "Scanning folders in '%s'"
-msgstr ""
+msgstr "Tutkitaan kansion â??%sâ?? alikansioita"
 
-#: ../mail/mail-ops.c:1198
+#: ../mail/mail-ops.c:1236
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Opening folder '%s'"
-msgstr ""
+msgstr "Avataan kansiota â??%sâ??"
 
-#: ../mail/mail-ops.c:1305
+#: ../mail/mail-ops.c:1343
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
-msgstr ""
+msgstr "Haetaan kansion â??%sâ?? levytilakiintiötietoja"
 
-#: ../mail/mail-ops.c:1377
+#: ../mail/mail-ops.c:1415
 #, c-format
 msgid "Opening store '%s'"
-msgstr ""
+msgstr "Avataan tallennustilaa â??%sâ??"
 
-#: ../mail/mail-ops.c:1448
+#: ../mail/mail-ops.c:1486
 #, c-format
 msgid "Removing folder '%s'"
-msgstr ""
+msgstr "Poistetaan kansiota â??%sâ??"
 
-#: ../mail/mail-ops.c:1566
+#: ../mail/mail-ops.c:1610
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "Siivotaan ja tallennetaan tiliä '%s'"
+msgstr "Siivotaan ja tallennetaan tiliä â??%sâ??"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Storing account '%s'"
-msgstr "Tallennetaan tiliä %s"
+msgstr "Tallennetaan tiliä â??%sâ??"
 
-#: ../mail/mail-ops.c:1684
+#: ../mail/mail-ops.c:1728
 #, c-format
 msgid "Refreshing folder '%s'"
-msgstr ""
+msgstr "Päivitetään kansiota â??%sâ??"
 
-#: ../mail/mail-ops.c:1724
+#: ../mail/mail-ops.c:1768
 #, c-format
 msgid "Expunging folder '%s'"
-msgstr ""
+msgstr "Siivotaan poistettuja kansiosta â??%sâ??"
 
-#: ../mail/mail-ops.c:1769
+#: ../mail/mail-ops.c:1813
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Tyhjennetään roskakoria '%s'"
+msgstr "Tyhjennetään roskakoria â??%sâ??"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1814
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1966
+#: ../mail/mail-ops.c:2017
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiä"
 
-#: ../mail/mail-ops.c:2055
+#: ../mail/mail-ops.c:2106
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../mail/mail-ops.c:2135
+#: ../mail/mail-ops.c:2193
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Virhe tallennettaessa viestejä: %s:\n"
-"%s"
+msgid "Error saving messages to: %s:\n"
+msgstr "Virhe tallennettaessa viestejä: %s:\n"
 
-#: ../mail/mail-ops.c:2207
+#: ../mail/mail-ops.c:2266
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2225 ../mail/mail-ops.c:2233
+#: ../mail/mail-ops.c:2286 ../mail/mail-ops.c:2296
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13123,142 +13141,179 @@ msgstr ""
 "Tulostiedostoa ei voi luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2248
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Tietoa ei voi kirjoittaa: %s"
+#: ../mail/mail-ops.c:2311
+msgid "Could not write data: "
+msgstr "Tietoa ei voitu kirjoittaa: "
 
-#: ../mail/mail-ops.c:2393
+#: ../mail/mail-ops.c:2455
 #, c-format
 msgid "Disconnecting from '%s'"
-msgstr ""
+msgstr "Katkaistaan yhteys kohteeseen â??%sâ??"
 
-#: ../mail/mail-ops.c:2393
+#: ../mail/mail-ops.c:2455
 #, c-format
 msgid "Reconnecting to '%s'"
-msgstr ""
+msgstr "Yhdistetään uudelleen kohteeseen â??%sâ??"
 
-#: ../mail/mail-ops.c:2489
+#: ../mail/mail-ops.c:2551
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 
-#: ../mail/mail-ops.c:2575
+#: ../mail/mail-ops.c:2637
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "Käyttäjä perui toimenpiteen."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:722
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:731
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Käytettävää tiliä ei löydy, viestin edelleenlähetys on peruttu."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:128
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr ""
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
 msgid "Invalid folder: '%s'"
-msgstr ""
+msgstr "Virheellinen kansio: â??%sâ??"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Määritellään hakunäkymää: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Päivitetään hakunäkymää \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Päivitetään hakunäkymää \"%s\""
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:675
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Hakunäkymää â??%sâ?? on muokattu ottamaan huomioon poistettu kansio \n"
+"â??%sâ??."
+msgstr[1] ""
+"Seuraavia hakunäkymiä\n"
+"%s on muokattu ottamaan huomioon poistettu kansio \n"
+"â??%sâ??."
+
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1290
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "â??Etsi roskapostiaâ?? epäonnistui"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "â??Ilmoita roskapostiksiâ?? epäonnistui"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "â??Ilmoita ei-roskapostiksiâ?? epäonnistui"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Kansio \"{0}\" on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kansio \"{1}\" on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13269,7 +13324,7 @@ msgstr ""
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13277,13 +13332,13 @@ msgstr ""
 "Vastaanoton kuittausta pyydettiin viestille \"{1}\". Lähetetäänkö kuittaus "
 "osoitteeseen {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "Allekirjoitus nimellä \"{0}\" on jo määritelty. Anna toinen nimi."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13291,122 +13346,109 @@ msgstr ""
 "Merkityksellisen aihe-kentän lisääminen viesteihisi helpottaa vastaanottajaa "
 "ymmärtämään, mistä viestissä on kyse."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Haluatko varmasti poistaa tämän tilin ja kaikki sen välimuistit?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Haluatko varmasti poistaa tämän tilin käytöstä ja poistaa kaikki sen "
 "välimuistit?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Haluatko varmasti avata {0} viestiä kerralla?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki poistetut viestit kansiosta \"%{0}\"?"
+msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kansiosta \"%{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Haluatko varmasti lähettää viestin HTML-muodossa?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
-msgstr ""
+msgstr "Haluatko varmasti lähettää viestin, jossa on virheellinen osoite?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr ""
+msgstr "Haluatko varmasti lähettää viestin, jossa on virheellisiä osoitteita?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
 "(Bcc)?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Haluatko varmasti lähettää ilman aihetta?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Syy: \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Syy: \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Tyhjä allekirjoitus"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Hakunäkymää \"{0}\" ei voi lisätä."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi kopioida nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi luoda."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voi luoda."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Tallennushakemisto ei voi luoda, syy: \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Hakunäkymää \"{0}\" ei voi muokata, koska sitä ei ole olemassa."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
 msgstr "Lähdettä \"{1}\" ei voi avata."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
-msgstr "Lähdettä \"{2}\" i voi avata."
+msgstr "Lähdettä \"{2}\" ei voi avata."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Kohdetta \"{2}\" ei voi avata."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13414,35 +13456,31 @@ msgstr ""
 "Lisenssitiedostoa \"{0}\" ei voi lukea asennusongelman takia. Et voi käyttää "
 "tätä lähdettä ennen kuin voit hyväksyä lisenssin."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ei voi nimetä uudestaan nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voi siirtää tai nimetä uudestaan."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Hakemistoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Tiedostoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Allekirjoitus-skriptiä \"{0}\" ei voi asettaa."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Roskapostin etsintä epäonnistui"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13451,27 +13489,27 @@ msgstr ""
 "salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista myös ettei "
 "CapsLock ole päällä."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Allekirjoitustiedostoa ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Poistetaanko viestit hakunäkymästä \"{0}\"?"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "_�lä poista käytöstä"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "�_lä poista"
+msgid "Do _Not Send"
+msgstr "�lä läh_etä"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "�lä poista"
+msgid "Do _Not Synchronize"
+msgstr "�_lä synkronoi"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "�lä poista käytöstä"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13479,60 +13517,63 @@ msgstr ""
 "Haluatko synkronoida paikallisesti kansiot, jotka on merkitty yhteydettömään "
 "käyttöön?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Haluatko merkitä kaikki viestit luetuiksi?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Syötä salasana."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten määrittelyjä."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Virhe suoritettaessa toimenpidettä."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa komentoa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitä ei voi ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jos jatkat, et voi palauttaa näitä viestejä."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "Jos poistat kansion, menetetään kaikki sen sisältö ja alikansiot "
 "sisältöineen pysyvästi."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
-msgstr ""
+msgstr "Jos poistat kansion, kaikki sen sisältö menetetään pysyvästi."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Jos jatkat, kaikki välimuistitilit poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13540,11 +13581,11 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
 "poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13552,23 +13593,23 @@ msgstr ""
 "Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "�lä välitä"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13578,29 +13619,29 @@ msgstr ""
 "Monet sähköpostijärjestelmän lisäävät viesteihin 'Apparently-To' otsakkeen "
 "viesteihin, joissa on vain BCC vastaanottajia. Jos tämä otsake lisätään, se "
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
-"määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
+"määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Lähteitä ei ole valittuna."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Tarkista tilisi asetukset ja yritä uudestaan."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Ota tili käyttöön tai lähetä käyttäen toista tiliä."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13609,7 +13650,7 @@ msgstr ""
 "sähköpostiosoitteita napsauttamalla Vastaanottaja: -painiketta kentän "
 "vieressä."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13619,63 +13660,59 @@ msgstr ""
 "sähköpostia:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Poistetaanko todella kansio \"{0}\" ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Really delete folder \"{0}\"?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Roskapostin raportoiminen ei onnistunut"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Ei-roskapostin raportoiminen ei onnistunut"
+msgid "Really delete folder \"{0}\"?"
+msgstr "Haluatko varmasti poistaa kansion â??{0}â???"
 
 #: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "Vastaa _yksityisesti"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "Lähetä kuittaus"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "Lähetetäänkö yksityinen vastaus?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "Lähetetäänkö vastaus kaikille vastaanottajille?"
+
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "Allekirjoitus on jo olemassa"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "Synkronoi"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetöntä käyttöä varten?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13683,7 +13720,7 @@ msgstr ""
 "Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voi nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13698,53 +13735,31 @@ msgstr ""
 "Monet sähköpostijärjestelmän lisäävät viesteihin 'Apparently-To' otsakkeen "
 "viesteihin, joissa on vain BCC vastaanottajia. Jos tämä otsake lisätään, se "
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
-"määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite "
+"määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite."
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Seuraavat hakunäkymät:\n"
-"{0}\n"
-"käyttivät poistettua kansiota:\n"
-"   \"{1}\"\n"
-"ja ne on päivitetty."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Seuraavat suodatinsäännöt:\n"
-"{0}\n"
-"käyttivät poistettua kansiota:\n"
-"   \"{1}\"\n"
-"ja ne on päivitetty."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
+"Seuraavaa vastaanottajaa ei tunnistettu kelvolliseksi "
+"sähköpostiosoitteeksi:\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
+"Seuraavia vastaanottajia ei tunnistettu kelvollisiksi "
+"sähköpostiosoitteiksi:\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13752,7 +13767,7 @@ msgstr ""
 "Kansio on ehkä lisätty järjestelmän puolesta.\n"
 "Siirry hakunäkymien muokkaukseen ja lisää se erikseen, jos tarpeen."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13760,12 +13775,12 @@ msgstr ""
 "Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Viestiä ei voi lähettää, koska et ole määritellyt vastaanottajia"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13773,11 +13788,11 @@ msgstr ""
 "Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13785,11 +13800,15 @@ msgstr ""
 "Tämä toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
 "alikansioissa luetuiksi."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "Tämä toiminto merkitsee kaikki viestit luetuiksi valitussa kansiossa."
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise-palvelimeen ei saatu yhteyttä."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13797,19 +13816,19 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13819,32 +13838,60 @@ msgstr ""
 "alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"Olet vastaamassa yksityisesti viestiin, joka saapui sähköpostilistalta. "
+"Sähköpostilista yrittää ohjata vastaustasi takaisin listalle. Haluatko "
+"jatkaa?"
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"Olet vastaamassa viestiin, joka saapui sähköpostilistalta, mutta olet "
+"vastaamassa yksityisesti lähettäjälle etkä sähköpostilistalle. Haluatko "
+"jatkaa?"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"Olet vastaamassa viestiin, joka lähetettiin useille vastaanottajille. "
+"Haluatko vastata kaikille heille?"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Oikeutesi eivät riitä tämän sähköpostin poistamiseen."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13854,115 +13901,121 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Kirjautuminen palvelimelle  \"{0}\" käyttäjänä \"{0}\" epäonnistui."
+msgstr "Kirjautuminen palvelimelle \"{0}\" käyttäjänä \"{0}\" epäonnistui."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "�lä _käytä"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "�_lä synkronoi"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1165
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "_Lähetä kuittaus"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "_Synkronoi"
+
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1166
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1167
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1168
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:1169
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1170
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1790 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1797 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1806
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1818
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1826
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1828
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2574
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../mail/message-list.c:2625 ../shell/e-shell-view.c:855
-msgid "Shell Backend"
-msgstr "Tulkin taustajärjestelmä"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4532 ../mail/message-list.c:5032
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4864
+#: ../mail/message-list.c:4643
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13970,15 +14023,7 @@ msgstr ""
 "Mikään viesti ei vastaa hakuehtojasi. Tyhjennä hakukenttä valikon kohdasta "
 "Haku -> Tyhjennä tai muuta hakua."
 
-#: ../mail/message-list.c:4866
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Tässä kansiossa on vain piilotettuja viestejä. Valitse Näytä-valikosta kohta "
-"Näytä piilotetut viestit, jos haluat nähdä ne."
-
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -14007,7 +14052,7 @@ msgid "Sent Messages"
 msgstr "Lähetetyt viestit"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "Koko"
 
@@ -14016,27 +14061,27 @@ msgid "Subject - Trimmed"
 msgstr "Otsikko - rajattu"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
@@ -14070,15 +14115,16 @@ msgstr ""
 "salausta. Tämä tarkoittaa, että yhteytesi on turvaton ja että olet "
 "haavoittuvainen yhteyden turvaan kohdistuville hyökkäyksille."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr ""
+#: ../modules/addressbook/addressbook-config.c:609
+#, fuzzy
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Syntymä- ja vuosipäivät"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:645
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:753
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -14088,17 +14134,17 @@ msgstr ""
 "on lista yleisistä porteista. Kysy tarvittaessa järjestelmäsi ylläpitäjältä "
 "mitä porttia sinun tulisi käyttää."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:827
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"Tämä on menetelmä, jota evolution käyttää tunnistamiseesi. Huomaa, että "
+"Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että "
 "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
 "palvelimellesi."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:902
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -14110,29 +14156,29 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1023
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1024
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1026
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1234
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -14189,16 +14235,16 @@ msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Kuinka monta merkkiä tulee kirjoittaa ennen kuin evolution yrittää "
-"automaattista täydennystä"
+"Kuinka monta merkkiä tulee kirjoittaa ennen kuin Evolution yrittää "
+"automaattista täydennystä."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
-msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
+msgstr "Viimeksi nimien valinta -ikkunassa valitun kansion URI"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "URI for the folder last used in the select names dialog."
-msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
+msgstr "Viimeksi nimien valinta -ikkunassa valitun kansion URI."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
@@ -14212,474 +14258,374 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Näytetäänkö esikatselupaneeli."
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Taulun sarake:"
-
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "_Table column:"
+msgstr "_Taulukon sarake:"
+
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "Automaattinen täydennys"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:191
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: ../modules/addressbook/e-book-shell-backend.c:341
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:343
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:348
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:350
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:358
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:360
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#: ../modules/calendar/e-cal-shell-backend.c:815
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Lähdeluettelo"
-
-#: ../modules/addressbook/e-book-shell-backend.c:598
-msgid "The registry of address books"
-msgstr "Luettelo osoitekirjoista"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Nykyinen näkymä"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr ""
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Esikatseltu yhteystieto"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Yhteystietojen esikatselupaneelissa näytettävä yhteystieto"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:688
-msgid "Preview is Visible"
-msgstr "Esikatselu on näkyvissä"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Whether the preview pane is visible"
-msgstr "Näytetäänkö esikatselupaneeli"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP-palvelimet"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Automaattisen täydennyksen asetukset"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin yhteystietojen kansioiden sijainti ja rakenne on muuttunut "
-"Evolution 1.x:n jälkeen.\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Sähköpostilistojen yhteystietojen muoto on muuttunut.\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution muuntaa kansioitasi..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Muutamien puhelinnumeroiden tallennustapa on muuttunut.\n"
-"\n"
-"Odota kärsivällisesti kun Evolution muuntaa kansioitasi..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolutionin Palm synkronoinnin muutosloki ja karttatiedostot ovat "
-"muuttuneet.\n"
-"\n"
-"Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:794
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-msgid "Source Selector Widget"
-msgstr "Lähteen valintaikkuna"
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
+msgid "Contacts"
+msgstr "Yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Tämä elementti näyttä osoitekirjaryhmiä"
+#: ../modules/addressbook/e-book-shell-backend.c:325
+msgid "Certificates"
+msgstr "Varmenteet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopioi valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
-msgstr ""
+msgstr "_Poista osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrä kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
 msgstr "Siirrä valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
-msgstr "_Nimeä valittu osoitekirja uudestaan"
+msgstr "Nimeä valittu osoitekirja uudestaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
-msgstr ""
+msgstr "_Etsi yhteystiedosta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
-msgstr ""
+msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
-msgstr ""
+msgstr "_Avaa yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti henkilölle..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
-msgstr "Lähetä viesti valituille  henkilöille"
+msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 #: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
-#: ../modules/calendar/e-memo-shell-view-actions.c:669
-#: ../modules/calendar/e-task-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
-msgstr "_Ominaisuudet..."
+msgstr "_Ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:890
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1614
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1628
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
-#: ../modules/calendar/e-memo-shell-view-actions.c:760
-#: ../modules/calendar/e-task-shell-view-actions.c:959
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:438
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
-msgstr ""
+msgstr "Tulosta kaikki näytettävät yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Tallenna vCard-muodossa..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
-#: ../modules/addressbook/e-book-shell-view.c:341
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view.c:343
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view.c:374
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view.c:376
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonyymisti"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_Kirjautuminen:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Yksi"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Hakusuodatin"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Haku_pohja:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
-msgstr "Hakusuodatin:"
+msgstr "Haku_suodatin:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14688,170 +14634,141 @@ msgstr ""
 "asetusta ei muuteta, etsitään oletuksena \"person\"-tyypin kohderyhmästä."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Ali"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
-msgstr "Etsi mahdolliset hakupohjat"
+msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_Kirjautumismenetelmä:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Hakualue:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Aikakatkaisu:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Käytä salattua yhteyttä:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "kortteja"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "_Tuo"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "Tuo _kalenteriin"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
-msgstr "_Tuo t_ehtäviin"
+msgstr "_Tuo tehtäviin"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:126
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:181
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:128
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "Sää"
 
-#: ../modules/calendar/e-cal-shell-backend.c:254
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-backend.c:408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:467
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:474
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:482
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:484
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:519
-#: ../plugins/itip-formatter/itip-formatter.c:2658
+#: ../modules/calendar/e-cal-shell-backend.c:729
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
-#: ../modules/calendar/e-cal-shell-backend.c:816
-msgid "The registry of calendars"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin kalenterikansioiden sijainti ja rakenne on muuttunut versiosta "
-"1.x\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Vanhojen asetusten siirto ei onnistunut tiedostosta evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar '%s'"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:169
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14860,40 +14777,20 @@ msgstr ""
 "Virhe kohteessa %s:\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:228
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "Ladataan kalentereita"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:632
-msgid "New Calendar..."
-msgstr "Uusi kalenteri..."
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
+msgid "_New Calendar..."
+msgstr "_Uusi kalenteri..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:647
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:774
-msgid "Date Navigator Widget"
-msgstr "Päivämäärävalitsin"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:775
-msgid "This widget displays a miniature calendar"
-msgstr "Tämä elementti näyttää pienen kalenterin"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:784
-msgid "Default Calendar Client"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:785
-msgid "Default client for calendar operations"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:795
-msgid "This widget displays groups of calendars"
-msgstr "Tämä elementti näyttää kalenteriryhmän"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:983
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avataan kalenteria %s"
@@ -14922,298 +14819,298 @@ msgstr "Poista vanhemmat tapahtumat kuin"
 msgid "Copying Items"
 msgstr "Kopioidaan tiedostoja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Siirretään kohteita"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
-msgstr ""
+msgstr "tapahtuma"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:503
-#: ../modules/calendar/e-task-shell-view-actions.c:620
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
-msgstr ""
+msgstr "_Poista kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
-msgid "Select _Today"
-msgstr "Valitse _tämä päivä"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
-msgstr "Tyhjennä"
+msgstr "_Tyhjennä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
-msgstr ""
+msgstr "_Poista tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
-msgstr ""
+msgstr "Poista valitut tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
-msgstr ""
+msgstr "Poista kaikki _esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Uusi koko pä_ivän tapahtuma..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "Tallenna iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
-msgstr ""
+msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
-msgstr ""
+msgstr "_Muunna kokoukseksi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
-msgstr ""
+msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1569
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "Lopeta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "Päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1599
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1607
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1751
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "Siirry"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:501
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
-msgstr ""
+msgstr "muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "Näytä valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
@@ -15222,22 +15119,22 @@ msgstr "Tulosta valittu muistilappu"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:618
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
-msgstr ""
+msgstr "tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
@@ -15246,96 +15143,76 @@ msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtävät keskeneräisiksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "_Tallenna iCalendar-muodossa..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
-msgstr ""
+msgstr "_Jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgid "Create a new shared memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Rekisteri muistilappuluetteloista"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Muistilappujen taulumalli"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "Ladataan muistilappuja"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-msgid "Default Memo Client"
-msgstr ""
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-msgid "Default client for memo operations"
-msgstr ""
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr ""
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Avataan muistilappuja sijainnista %s"
@@ -15345,63 +15222,63 @@ msgstr "Avataan muistilappuja sijainnista %s"
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
-msgstr ""
+msgstr "_Etsi muistilapusta..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
-msgstr ""
+msgstr "Etsi tekstiä näytettävästä muistilapusta"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
-msgstr ""
+msgstr "_Poista muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
-msgstr ""
+msgstr "Poista valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
-msgstr ""
+msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:705
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:707
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
@@ -15424,80 +15301,42 @@ msgstr "Poista muistilaput"
 
 #: ../modules/calendar/e-memo-shell-view.c:225
 msgid "Delete Memo"
-msgstr ""
+msgstr "Poista muistilappu"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Rekisteri tehtävälistoista"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Tehtävien taulumalli"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin tehtäväkansioiden sijainti ja rakenne on muuttunut versiosta "
-"1.x\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks '%s'"
-msgstr ""
-
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-msgid "Default Task Client"
-msgstr ""
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-msgid "Default client for task operations"
-msgstr ""
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr "Tämä elementti näyttä ryhmiä tehtävälistaluetteloista"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
@@ -15507,7 +15346,7 @@ msgstr "Avataan tehtävät %s"
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:562
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15519,95 +15358,95 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
-msgstr ""
+msgstr "_Etsi tehtävästä..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
-msgstr ""
+msgstr "Etsi tekstiä näytettävästä tehtävästä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "Kopioi..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
-msgstr ""
+msgstr "_Poista tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
-msgstr ""
+msgstr "Poista valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
-msgstr ""
+msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:869
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:871
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
@@ -15622,219 +15461,187 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
-msgstr "Poiista tehtäviä"
+msgstr "Poista tehtäviä"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
-msgstr ""
+msgstr "Poista tehtävä"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
 msgstr "%d liitetty viesti"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
-#: ../modules/mail/e-mail-shell-content.c:678
-msgid "Group by Threads"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Whether to group messages by threads"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:930
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr ""
+msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Permanently remove all the deleted messages from all accounts"
-msgstr ""
+msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "Piilota _luetut viestit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Piilota kaikki luetut viestit väliaikaisesti"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "Piilota _valitut viestit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "Piilota valitut viestit väliaikaisesti"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "Näytä piil_otetut viestit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
-
 #: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
@@ -15892,233 +15699,253 @@ msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "Piilota _poistetut viestit"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Piilota poistetut viestit sen sijaan, että ne näytettäisiin yliviivattuina"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Show _Deleted Messages"
+msgstr "Näytä _poistetut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Show deleted messages with a line through them"
+msgstr "Näytä poistetut viestit yliviivattuna"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "Viimeisimmät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoiteeet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../modules/mail/e-mail-shell-view-private.c:889
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:900
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../modules/mail/e-mail-shell-view-private.c:906
-#: ../modules/mail/e-mail-shell-view-private.c:913
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-private.c:919
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:925
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:931
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:943
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:946
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:928
 msgid "Proxy _Logout"
 msgstr "Kirjaudu _pois välimuistista"
 
-#: ../modules/mail/em-composer-prefs.c:479
+#: ../modules/mail/em-account-prefs.c:133
+msgid "Evolution Account Assistant"
+msgstr "Evolutionin sähköpostitilien apulainen"
+
+#: ../modules/mail/em-account-prefs.c:182
+msgid "Account Editor"
+msgstr "Tilimuokkain"
+
+#: ../modules/mail/em-composer-prefs.c:505
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:211
+msgid "Enabled"
+msgstr "käytössä"
+
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Joka kerta"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Kerran päivässä"
 
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Kerran viikossa"
 
-#: ../modules/mail/em-mailer-prefs.c:101
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../modules/mail/em-mailer-prefs.c:223
+#: ../modules/mail/em-mailer-prefs.c:201
 msgid "Add Custom Junk Header"
 msgstr "Lisää oma roskapostiotsake"
 
-#: ../modules/mail/em-mailer-prefs.c:227
+#: ../modules/mail/em-mailer-prefs.c:209
 msgid "Header Name:"
-msgstr "_Otsakkeen nimi:"
+msgstr "Otsakkeen nimi:"
 
-#: ../modules/mail/em-mailer-prefs.c:228
+#: ../modules/mail/em-mailer-prefs.c:210
 msgid "Header Value Contains:"
 msgstr "Otsakkeen arvo sisältää:"
 
-#: ../modules/mail/em-mailer-prefs.c:327
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:310
 msgid "Header"
-msgstr "Ylätunniste:"
+msgstr "Otsake"
 
-#: ../modules/mail/em-mailer-prefs.c:331
+#: ../modules/mail/em-mailer-prefs.c:314
 msgid "Contains Value"
 msgstr "Sisältää arvon"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:724 ../modules/mail/em-mailer-prefs.c:795
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-lisäosa on käytettävissä ja ohjelma on asennettu."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:732 ../modules/mail/em-mailer-prefs.c:804
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-lisäosa ei ole käytettävissä. Tarkista että sen paketti on asennettu."
 
-#: ../modules/mail/em-mailer-prefs.c:768
+#: ../modules/mail/em-mailer-prefs.c:751
 msgid "No junk plugin available"
-msgstr ""
-
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1153
-msgid "_Table column:"
-msgstr ""
+msgstr "Roskapostiliitännäistä ei ole käytettävissä"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1155
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Date header:"
-msgstr ""
+msgstr "_Päiväysotsake:"
 
-#: ../modules/mail/em-mailer-prefs.c:1156
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Show _original header value"
+msgstr "Näytä _alkuperäinen otsakkeen arvo"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Tarkista onko Evolution sähköpostin oletusohjelma"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
+"Tarkista aina Evolutionin käynnistyessä onko se sähköpostin oletusohjelma."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -16136,6 +15963,51 @@ msgstr "Python-testilisäosa"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testilisäosa pythonin EPlugin-lataimelle."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../widgets/misc/e-import-assistant.c:396
+msgid "Please select the information that you would like to import:"
+msgstr "Valitse tieto jota haluaisit tuoda:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "Ohjelmasta %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+msgid "Importing Files"
+msgstr "Tiedostojen tuonti"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Tuonti peruttiin. Napsauta â??Eteenpäinâ?? jatkaaksesi."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "Tuonti on valmis. Napsauta â??Eteenpäinâ?? jatkaaksesi."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+msgid "Evolution Setup Assistant"
+msgstr "Evolutionin asetusapulainen"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid "Welcome"
+msgstr "Tervetuloa"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Tervetuloa Evolutioniin. Seuraavaksi kysyttävien tietojen avulla Evolution "
+"ottaa yhteyttä sähköpostitileihisi ja tuo tarvittavia tietoja muista "
+"sovelluksista.\n"
+"\n"
+"Jatka painamalla \"Eteenpäin\"-painiketta. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Lisää paikallisia osoitekirjoja Evolutioniin."
@@ -16150,14 +16022,8 @@ msgid ""
 "body"
 msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -16197,23 +16063,23 @@ msgstr "Sisäkkäiset äänet"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Soita ääniliitteet suoraan sähköpostiviesteistä."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16224,141 +16090,139 @@ msgstr ""
 "osoitekirjat. Palautus palauttaa myös kaikki asetukset, sähköpostisuotimet "
 "jne."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Palauta tiedot Evolutioniin varmuuskopiotiedostosta"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Valitse palautettava Evolution-varmuuskopio:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Palauta varmuuskopio"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Varmuuskopioi asetukset..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_Varmuuskopioi Evolutionin asetukset..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "_Palauta asetukset..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "_Palauta Evolutionin asetukset..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
-#: ../plugins/backup-restore/backup.c:63
+#: ../plugins/backup-restore/backup.c:80
 msgid "Backup Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:84
 msgid "Check Evolution Backup"
 msgstr "Tarkista evolutionin varmuuskopio"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
 "kalentereita, tehtäviä ja muistioita)"
 
-#: ../plugins/backup-restore/backup.c:213
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backup complete"
 msgstr "Varmuuskopio on valmis"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "Käynnistetään Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+#: ../plugins/backup-restore/backup.c:404
+msgid "Back up current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:410
 msgid "Extracting files from backup"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:482
 msgid "Removing temporary backup files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "Tarkistetaan paikalliset lähteet"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:684
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Backup"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:748
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, että Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../plugins/backup-restore/backup.c:510
-msgid ""
-"This may take a while depending on the amount of data in your account."
+#: ../plugins/backup-restore/backup.c:769
+msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Tämä saattaa kestää hetken, riippuen tililläsi olevien tietojen määrästä."
 
@@ -16382,76 +16246,77 @@ msgstr ""
 "Haluatko varmasti palauttaa Evolutionin valitusta varmuuskopiotiedostosta?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Evolution varmuuskopiointi voidaan käynnistä vain, kun Evolution ei ole "
-"käynnissä. Varmista että olet tallentanut ja sulkenut kaikki ikkunat ennen "
-"jatkamista. Voit asetta evolutionin käynnistymään automaattisesti, kun "
-"varmuuskopiointi on päättynyt."
+msgid "Close and Backup Evolution"
+msgstr "Sulje ja varmuuskopioi Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Sulje ja palauta Evolutionin varmuuskopio"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "Oikeudet eivät riitä"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Virheellinen Evolutionin varmuuskopiotiedosto"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "Valitse palautettavaksi kelvollinen Evolutionin varmuuskopio"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "Valittuun kansioon ei voi kirjoittaa."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr ""
-"Tämä poistaa kaikki nykyiset Evolutionin tiedot ja asetukset, ja palauttaa "
-"ne varmuuskopiosta. Varmuuskopion palautus voidaan käynnistää vain, kun "
-"Evolution ei ole käynnissä. Varmista että olet tallentanut ja sulkenut "
-"kaikki ikkunat ennen jatkamista. Voit asetta evolutionin käynnistymään "
-"automaattisesti, kun varmuuskopiointi on päättynyt."
+"Tietojen ja asetusten varmuuskopioimiseksi Evolution on suljettava. Tallenna "
+"kaikki tallentamattomat tiedot ennen jatkamista."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"Tietojen ja asetusten palauttamiseksi Evolution on suljettava. Tallenna "
+"kaikki tallentamattomat tiedot ennen jatkamista. Tämä poistaa kaikki "
+"nykyiset Evolutionin tiedot ja asetukset ja palauttaa varmuuskopion."
+
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "Yhdistä yhteystiedot ja kuvat pidginin tuttavalistasta"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -16472,33 +16337,33 @@ msgstr ""
 "Lisää nimet ja sähköpostiosoitteet automaattisesti osoitekirjaan, kun "
 "vastaat viesteihin. Liittää myös IM-yhteystiedot tuttavalistoiltasi."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:159
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
-msgstr ""
+msgstr "Bogofilter ei ole käytettävissä. Asenna se ensin."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:191
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:193
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogofilter-lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:216
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Putki bogofilterille epäonnistui, virhekoodi: %d."
+msgstr "Putki Bogofilterille epäonnistui, virhekoodi: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:399
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
@@ -16524,55 +16389,53 @@ msgstr "Bogofilter-asetukset"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filter junk messages using Bogofilter."
-msgstr "Suodata roskaposteja bogofilterillä."
+msgstr "Suodata roskaposteja Bogofilterillä."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
+"Tunnistautuminen epäonnistui. Palvelin vaatii onnistuneen kirjautumisen."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
-msgstr ""
+msgstr "Annettua osoitetta ei löydy."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
+"Palvelin palautti odottamatonta dataa.\n"
+"%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
-msgstr ""
+msgstr "Palvelimen vastauksen tulkitseminen ei onnistunut"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Käyttäjän kalenteri"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
-msgstr ""
+msgstr "Palvelimen osoitteen noutaminen epäonnistui."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Etsitään käyttäjän kalentereja..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
-msgstr ""
+msgstr "Yhtään käyttäjäkalenteria ei löytynyt."
 
 #: ../plugins/caldav/caldav-browse-server.c:794
 #, c-format
@@ -16582,65 +16445,65 @@ msgstr "Aiempi yritys epäonnistui: %s"
 #: ../plugins/caldav/caldav-browse-server.c:796
 #, c-format
 msgid "Previous attempt failed with code %d"
-msgstr ""
+msgstr "Edellinen yritys epäonnistui koodilla %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr ""
+msgid "Enter password for user %s on server %s"
+msgstr "Syötä salasana käyttäjälle %s palvelimeen %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr ""
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
-msgstr ""
+msgstr "Etsitään kansion sisältöä..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
-msgstr ""
+msgstr "Käytettävissä olevien kalenterien luettelo:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
-msgstr ""
+msgstr "Tukee"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
-msgstr ""
+msgstr "Palvelimen osoite â??%sâ?? on virheellinen"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
-msgstr "Käytä _SSLää"
+msgstr "Käytä _SSL:ää"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Vi_rkistä:"
 
@@ -16652,31 +16515,31 @@ msgstr "Lisää CalDAV-tuki Evolutioniin."
 msgid "CalDAV Support"
 msgstr "CalDAV-tuki"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_Muokkausvalinnat"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "_Tiedostonimi:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Valitse kalenteritiedosto"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Avattaessa"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Tiedoston muuttuessa"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Toistuvasti"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Pakota vain _luku"
 
@@ -16688,11 +16551,11 @@ msgstr "Lisää paikallisia kalentereita Evolutioniin."
 msgid "Local Calendars"
 msgstr "Paikalliset kalenterit"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_Salattu yhteys"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "Käyttäjät_unnus:"
 
@@ -16740,26 +16603,26 @@ msgstr "Sää: kirkas yö"
 msgid "Weather: Thunderstorms"
 msgstr "Sää: ukkosmyrskyjä"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Valitse sijainti"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Yksikkö:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrinen (Celsiusta, cm jne.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheitia, tuumia jne.)"
 
@@ -16774,59 +16637,62 @@ msgstr "Sääkalenterit"
 #: ../plugins/contacts-map/contacts-map.c:55
 #: ../plugins/contacts-map/contacts-map.c:201
 msgid "Contacts map"
-msgstr ""
+msgstr "Yhteystietokartta"
 
 #: ../plugins/contacts-map/contacts-map.c:56
 msgid "Show a map of all the contacts"
-msgstr ""
+msgstr "Näytä kartta kaikista yhteystiedoista"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
 msgid "Add a map showing the location of contacts when possible."
-msgstr ""
+msgstr "Jos mahdollista, lisää kartta yhteystietojen sijainnista."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
 msgid "Map for contacts"
-msgstr ""
+msgstr "Yhteystietokartta"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Tarkista onko Evolution sähköpostin oletusohjelma"
+#: ../plugins/dbx-import/dbx-importer.c:232
+#, fuzzy
+msgid "Select folder to import OE folder into"
+msgstr "Valitse kansio, johon tuodaan"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Tarkista aina Evolutionin käynnistyessä onko se sähköpostin oletusohjelma."
+#: ../plugins/dbx-import/dbx-importer.c:251
+#, fuzzy
+msgid "Importing Outlook Express data"
+msgstr "Tuodaan tietoja Outlookista"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Tarkista käynnistettäessä, onko Evolution sähköpostin oletusohjelma."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Tuo outlook-viestejä PST-tiedostosta."
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Sähköpostin oletusohjelma"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook DBX import"
+msgstr "Outlookin PST-tuoja"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#, fuzzy
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlookin omat kansiot (.pst)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Merkitse _oletusosoitekirjaksi"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
-msgstr ""
+msgstr "_Täydennä automaattisesti tästä osoitekirjasta"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Merkitse _oletuskalenteriksi"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Merkitse _oletustehtävälistaksi"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Merkitse _oletusmuistiolistaksi"
 
@@ -16865,7 +16731,7 @@ msgid "Protected"
 msgstr "Suojattu"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "Salainen"
 
@@ -16878,14 +16744,14 @@ msgstr "Erittäin salainen"
 #: ../plugins/email-custom-header/email-custom-header.c:379
 msgctxt "email-custom-header"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16893,12 +16759,12 @@ msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 msgstr "Arvot"
 
@@ -16921,7 +16787,7 @@ msgstr ""
 "Käynnistä muokkain automaattisesti, kun nappia painetaan viestin muokkaimessa"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Käynnistä automaattisesti uutta viestiä muokattaessa"
 
@@ -16933,11 +16799,11 @@ msgstr "Ulkoisen muokkaimen oletuskomento"
 msgid "The default command that must be used as the editor."
 msgstr "Oletuskomento, jota käytetään ulkoisena muokkaimena."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16945,8 +16811,8 @@ msgstr ""
 "Emacsia varten käytä arvoa \"xemacs\"\n"
 "VI:tä varten käytä arvoa \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -16996,17 +16862,19 @@ msgstr ""
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
-msgstr ""
+msgstr "Lisää kasvokuva oletuksena"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
+"Lisätäänkö kasvokuva lähteviin viestiin automaattisesti. Kuva on asetettava "
+"ennen tämän valintaa, muuten mitään ei tapahdu."
 
 #: ../plugins/face/face.c:286
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-msgstr ""
+msgstr "Valitse png-kuva (suositellaan kokoa 48*48, tiedostokoko < 720 tavua)"
 
 #: ../plugins/face/face.c:296
 msgid "Image files"
@@ -17014,31 +16882,31 @@ msgstr "Kuvatiedostot"
 
 #: ../plugins/face/face.c:355
 msgid "_Insert Face picture by default"
-msgstr ""
+msgstr "_Lisää kasvokuva oletuksena"
 
 #: ../plugins/face/face.c:366
 msgid "Load new _Face picture"
-msgstr ""
+msgstr "Lataa uusi _kasvokuva"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
-msgstr ""
+msgstr "Sisällytä _kasvokuva"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Attach a small picture of your face to outgoing messages."
-msgstr ""
+msgstr "Lisää lähteviin viesteihin pieni kuva kasvoistasi."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
-msgstr ""
+msgstr "Luku epäonnistui"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
 msgid "Invalid Image Size"
-msgstr ""
+msgstr "Virheellinen kuvakoko"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
 msgid "Not an image"
-msgstr ""
+msgstr "Tiedosto ei ole kuvatiedosto"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
@@ -17049,22 +16917,20 @@ msgid "The file cannot be read"
 msgstr "Tiedostoa ei voi lukea"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid ""
-"The file you selected does not look like a valid .png image. Error: {0}"
-msgstr ""
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "Valittu tiedosto ei näytä kelvolliselta .png-kuvalta. Virhe: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Palvelin</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Palvelin"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Syötä salasana käyttäjälle %s tilattujen kalentereiden käyttöä varten."
+msgstr "Syötä salasana käyttäjälle %s tilattujen kalentereiden käyttöä varten."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17073,29 +16939,29 @@ msgstr ""
 "Ei voi lukea tietoja Googlen palvelimelta.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:727
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:953
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "_Kalenteri:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "Nouda _luettelo"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
-msgstr "Lisää google-kalentereita Evolutioniin."
+msgstr "Lisää Google-kalentereita Evolutioniin."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Google-kalenterit"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Muistilista"
 
@@ -17105,7 +16971,7 @@ msgstr "Uusi _jaettu kansio..."
 
 #: ../plugins/groupwise-features/gw-ui.c:119
 msgid "_Proxy Login..."
-msgstr "Välimuistin kirjautuminen..."
+msgstr "_Välimuistin kirjautuminen..."
 
 #: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
@@ -17125,14 +16991,14 @@ msgstr "Hyväksy alustavasti"
 
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
-msgstr "Lähetä kokous uudestaan..."
+msgstr "_Lähetä kokous uudestaan..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17157,19 +17023,19 @@ msgstr ""
 "Asenna jaettu kansio napsauttamalla \"Toteuta\"\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:239
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "Asenna jaettu kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:243
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "Jaetun kansion asennus"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Roskapostin asetukset"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Roskapostin asetukset"
@@ -17180,12 +17046,7 @@ msgstr "Sähköposti:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:2
 msgid "Junk List:"
-msgstr ""
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "�lä _käytä"
+msgstr "Roskapostilista:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
@@ -17205,13 +17066,15 @@ msgstr "_Poista"
 msgid "Message Retract"
 msgstr "Viestin peruminen"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
+"Viestin peruminen saattaa poistaa sen vastaanottajan sähköpostilaatikosta. "
+"Oletko varma?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Viestin peruminen onnistui"
 
@@ -17221,7 +17084,7 @@ msgstr "Lisää lähetysvaihtoehtoja"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
-msgstr "Lisää lähetysvalintoja groupwise-viesteihin"
+msgstr "Lisää lähetysvalintoja GroupWise-viesteihin"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "Fine-tune your GroupWise accounts."
@@ -17240,8 +17103,7 @@ msgid "The server did not allow the selected message to be retracted."
 msgstr "Palvelin ei sallinut valitun viestin perumista."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid ""
-"Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr "Tili &quot;{1}&quot; on jo olemassa. Tarkista kansiopuusi."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
@@ -17313,14 +17175,14 @@ msgstr "Tämä on toistuva tapaaminen"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
 msgid "This will create a new meeting using the existing meeting details."
-msgstr "Tämä luo uuden kokouksen käyttäen olemassaolevan kokouksen tietoja."
+msgstr "Tämä luo uuden kokouksen käyttäen olemassa olevan kokouksen tietoja."
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
 msgid ""
 "This will create a new meeting with the existing meeting details. The "
 "recurrence rule needs to be re-entered."
 msgstr ""
-"Tämä luo uuden kokouksen olemassaolevan kokouksen tiedoilla. Kokouksen "
+"Tämä luo uuden kokouksen olemassa olevan kokouksen tiedoilla. Kokouksen "
 "toistuvuus-säännöt täytyy syöttää uudestaan."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
@@ -17334,32 +17196,32 @@ msgid "Would you like to decline it?"
 msgstr "Haluatko estää tämän?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Käyttäjät:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Muokkaa huomautusviestiä"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "_Yhteystiedot..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Jaetun kansion huomautus"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Osallistujat saavat seuraavan huomautuksen.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Käyttäjät:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Ei jaettu"
 
 #: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
-msgstr "_Jaettu henkilöille ..."
+msgstr "_Jaettu henkilöille..."
 
 #: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
@@ -17410,52 +17272,60 @@ msgid "Proxy"
 msgstr "Välimuisti"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Tilin nimi</b>"
+#: ../widgets/misc/e-account-tree-view.c:230
+msgid "Account Name"
+msgstr "Tilin nimi"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Välimuistiin kirjautuminen"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "Välimuistin välilehti on käytettävissä vain, jos tilin verkkoyhteydet ovat "
 "auki."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Välimuisti on käytettävissä vain jos tili on käytössä."
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+#, fuzzy
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Välimuisti"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Lähetyksen lisäasetukset"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:311
 msgid "Enter the users and set permissions"
 msgstr "Syötä käyttäjät ja aseta oikeudet"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:407
 msgid "Sharing"
 msgstr "Jakaminen"
 
@@ -17463,81 +17333,77 @@ msgstr "Jakaminen"
 msgid "Custom Notification"
 msgstr "Oma huomautus"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "Lisää   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "Muokkaa"
+
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Viestin tila"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "Lähettäjä:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Luontipäivä:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Vastaanottaja: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Toimitettu: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Avattu: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Hyväksytty: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Poistettu: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Hylätty: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Valmistunut: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Ei lähetetty: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Lisää Hula-tuki Evolutioniin."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula-tuki"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
-msgstr ""
+msgstr "Sisäkkäiset kuvat"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
 msgid "View image attachments directly in mail messages."
-msgstr ""
+msgstr "Näytä kuvaliitteet suoraan sähköpostiviesteissä."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-otsakkeet"
@@ -17584,142 +17450,144 @@ msgstr "Hienosäädä IMAP-tilien asetuksia."
 msgid "IMAP Features"
 msgstr "IMAP-ominaisuudet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "Kalenterin \"%s\" lataus epäonnistui"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Kalenterin â??%sâ?? lataus epäonnistui (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Opening the calendar. Please wait.."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:878
 msgid "Searching for an existing version of this appointment"
-msgstr "Etsitään olemassaolevia versioita tapaamisesta"
+msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1059
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1172
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send task information, the task does not exist"
 msgstr "Tehtävän tietoja ei voitu lähettää, koska tehtävää ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1466
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1536
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17727,15 +17595,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1778
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17743,11 +17611,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1683
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17755,629 +17623,607 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2456
 msgid "This meeting recurs"
-msgstr "Tapaaminen on _toistuva"
+msgstr "Tapaaminen on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2459
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2462
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2683
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2693
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2706
+#: ../plugins/itip-formatter/itip-formatter.c:2739
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2708
+#: ../plugins/itip-formatter/itip-formatter.c:2721
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "+%Ana %d. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %d. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %d. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %d. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %d. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %d. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %d. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %d. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Vastaa henkilön <b>%s</b> puolesta"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Vastaanotettu henkilön <b>%s</b> puolesta"
-
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot %s kautta:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot:"
+msgid "Please respond on behalf of %s"
+msgstr "Vastaa henkilön %s puolesta"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> delegoi seuraavan kokouksen sinulle:"
+msgid "Received on behalf of %s"
+msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa:"
+msgid "%s has published the following meeting information:"
+msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> toivoo lisäystänsä olemassaolevaan kokoukseen %s kautta:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan kokoukseen."
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
-
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> %s kautta lähetti takaisin seuraavan kokousvastauksen:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> lähetti takaisin seuraavan kokousvastauksen:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> perui seuraavan kokouksen %s:n kautta:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> on perunut seuraavan tapaamisen."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia kokoukseen."
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> ehdottaa seuraavia muutoksia kokoukseen."
+msgid "%s has sent back the following meeting response:"
+msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s perui seuraavan kokouksen %s:n kautta:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> kieltäytyi seuraavista kokousmuutoksista."
+msgid "%s has canceled the following meeting."
+msgstr "%s on perunut seuraavan tapaamisen."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> julkaisi %s:n kautta seuraavat tehtävät:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> julkaisi seuraavat tehtävät:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> pyytää %s:n suorittamaan seuraavat tehtävät:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> antoi sinulle tehtävän %s:n kautta:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s kieltäytyi seuraavista kokousmuutoksista."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> antoi sinulle tehtävän:"
+msgid "%s through %s has published the following task:"
+msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään %s:n kautta"
+msgid "%s has published the following task:"
+msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> %s kautta toivoo saavansa viimeisimmät tiedot seuraavista "
-"työtehtävistä:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
+msgid "%s has assigned you a task:"
+msgstr "%s antoi sinulle tehtävän:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s haluaa lisätä olemassa olevaan tehtävään %s kautta:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> lähetti takaisin seuraavan annetun tehtävän vastauksen:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän %s:n kautta:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr ""
-"<b>%s</b> %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ehdottaa seuraavia muutoksia annettuun tehtävään:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> kieltäytyi seuraavasta toimeksiannosta %s kautta:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s on perunut seuraavan annetun tehtävän %s:n kautta:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> on kieltäytynyt seuraavasta annetusta tehtävästä:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s on perunut seuraavan annetun tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> julkaisi %s:n kautta seuraavan muistilapun:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> julkaisi seuraavan muistilapun:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun %s kautta:"
+msgid "%s has published the following memo:"
+msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> perui seuraavan jaetun muistilapun %s:n kautta:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> on perunut seuraavan jaetun muistilapun:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s on perunut seuraavan jaetun muistilapun:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
-msgstr ""
+msgstr "Koko päivä:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Loppumisaika:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "H_yväksy"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "_Hyväksy"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
 msgstr "_Hyväksy kaikki"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Lähetä tiedot"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_Päivitä"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Näytä \"text/calendar\" MIME-osat viesteissä."
+msgstr "Näytä \"text/calendar\"-MIME-osat viesteissä."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Itip-muotoilija"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+#, fuzzy
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
 "&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
 "osallistujan &quot;{1}&quot;?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Kokous on valtuutettu"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
-"Vastaus ei ole olemassaolevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
+"Vastaus ei ole olemassa olevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Piippaa tai soita äänitiedosto."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "Vilkuta kuvaketta ilmoitusalueella."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "Ota käyttöön D-Bus-viestit."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Ota käyttöön kuvake ilmoitusalueella."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Luo D-BUS-viestin , kun uusia sähköpostiviestejä saapuu."
+msgstr "Luo D-BUS-viestin, kun uusia sähköpostiviestejä saapuu."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr ""
-"Jos tosi, piipataan, muutoin soitetaan äänitiedosto uusien viestien "
+"Jos \"true\", piipataan, muutoin soitetaan äänitiedosto uusien viestien "
 "saapuessa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "Huomauta uusista viesteistä vain saapuvien kansiossa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "Soita äänitiedosto uuden sähköpostin saapuessa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "Ponnahdusikkuna kuvakkeen kanssa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Soitettavan äänitiedoston nimi."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
-msgid ""
-"Sound file to be played when new messages arrive, if not in beep mode."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "Käytä ääniteemaa"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-"Soitetaanko äänitiedosto vai piipataanko uuden sähköpostin saapuessa."
+msgstr "Soitetaanko äänitiedosto vai piipataanko uuden sähköpostin saapuessa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Näytetäänkö viesti kuvakkeen päällä uuden sähköpostin saapuessa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "Vilkkuuko uudesta sähköpostista ilmoittava kuvake."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Huomautetaanko uusista viesteistä vain saapuvien kansiossa."
 
-#: ../plugins/mail-notification/mail-notification.c:355
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "Evolutionin viestihuomautus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "Sähköpostihuomautuksen ominaisuudet"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18392,69 +18238,67 @@ msgstr[1] ""
 "%d uutta viestiä\n"
 "kansiossa %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:517
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "Lähettäjä: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:529
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
-msgstr ""
+msgstr "Aihe: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:538
+#: ../plugins/mail-notification/mail-notification.c:542
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d uusi viesti vastaanotettu."
 msgstr[1] "%d uutta viestiä vastaanotettu."
 
-#: ../plugins/mail-notification/mail-notification.c:558
-#: ../plugins/mail-notification/mail-notification.c:563
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "Uusi sähköposti"
 
-#: ../plugins/mail-notification/mail-notification.c:617
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
 msgstr "Näytä kuvake _ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:645
-msgid "B_link icon in notification area"
-msgstr "_Vilkuta kuvaketta ilmoitusalueella"
-
-#: ../plugins/mail-notification/mail-notification.c:655
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "Näytä viesti _ponnahdusikkunassa kuvakkeen lisäksi"
 
-#: ../plugins/mail-notification/mail-notification.c:840
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "_Soita ääniä uuden sähköpostin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:882
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:901
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:912
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:970
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../plugins/mail-notification/mail-notification.c:979
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
-msgstr "Luo D-Bus-viesti"
+msgstr "Luo _D-Bus-viesti"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18465,12 +18309,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Huomauttaa uusien viestien saapumisesta."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
-msgstr ""
+msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:498
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18479,7 +18323,7 @@ msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin "
 "lisättyä tapahtumaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:501
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18488,7 +18332,7 @@ msgstr ""
 "Valittu tehtävälista sisältää jo tehtävän \"%s\". Haluatko muokata aiemmin "
 "lisättyä tehtävää?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:504
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18497,7 +18341,10 @@ msgstr ""
 "Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata "
 "aiemmin lisättyä muistilappua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18505,7 +18352,10 @@ msgstr ""
 "Valittu kalenteri sisältää jo joitain tapahtumia annetuista sähköposteista. "
 "Haluatko silti luoda uusia tapahtumia?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:524
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18513,7 +18363,10 @@ msgstr ""
 "Valittu tehtävälista sisältää jo joitain tehtäviä annetuista sähköposteista. "
 "Haluatko silti luoda uusia tehtäviä?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18521,7 +18374,10 @@ msgstr ""
 "Valittu muistilappulista sisältää jo joitain muistilappuja annetuista "
 "sähköposteista. Haluatko silti luoda uusia muistilappuja?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:545
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18535,7 +18391,10 @@ msgstr[1] ""
 "Valittu kalenteri sisältää jo tapahtumia tälle sähköpostille. Haluatko silti "
 "luoda uudet tapahtumat?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:551
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18549,7 +18408,10 @@ msgstr[1] ""
 "Valittu tehtäväluettelo sisältää jo tehtäviä tälle sähköpostille. Haluatko "
 "silti luoda uudet tehtävät?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18563,25 +18425,25 @@ msgstr[1] ""
 "Valittu muistilappuluettelo sisältää jo muistilappuja näille sähköposteille. "
 "Haluatko silti luoda uudet muistilaput?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:627
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:698
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:727
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:734
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18589,7 +18451,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18597,7 +18459,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:740
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18605,40 +18467,40 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/mail-to-task/mail-to-task.c:953
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Lähdeluetteloa ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1072
 msgid "Create an _Event"
 msgstr "Luo t_apahtuma"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1064
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1096
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -18646,55 +18508,55 @@ msgstr "Luo uusi kokous valitusta viestistä"
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtäväksi."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
 msgstr "Nouda arkisto viestin sisältämästä postituslistasta"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Nouda tietoja viestin sisältämän postituslistan käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Kirjoita vastaus viestin sisältämälle sähköpostilistalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Tilaa viestin sisältämä postituslista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Peru viestin sisältämän postituslistan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -18797,15 +18659,15 @@ msgstr ""
 "Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
 "kaikissa sen alikansioissa?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
-#: ../plugins/mark-all-read/mark-all-read.c:188
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "Vain nykyisessä _kansiossa"
 
-#: ../plugins/mark-all-read/mark-all-read.c:415
+#: ../plugins/mark-all-read/mark-all-read.c:439
 msgid "Mark Me_ssages as Read"
 msgstr "Merkitse vie_stit luetuiksi"
 
@@ -18865,39 +18727,43 @@ msgstr "Suosi raakatekstiä"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Näytä viestit raakatekstinä, vaikka ne sisältäisivät HTML-sisältöä."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Let Evolution choose the best part to show."
-msgstr ""
+msgstr "Anna Evolutionin valita näytettäväksi paras osa."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text if present"
-msgstr ""
+msgstr "Näytä raakatekstinä, jos mahdollista"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
+"Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
+"Evolutionin valita näytettäväksi paras osa."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Only ever show plain text"
-msgstr ""
+msgstr "Näytä aina raakatekstinä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
+"Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin "
+"pyydetään."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:257
 msgid "Show s_uppressed HTML parts as attachments"
-msgstr ""
+msgstr "Näytä _piilotetut HTML-osat liitetiedostoina"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:277
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -18911,7 +18777,7 @@ msgstr "Profiloi Evolutionin data-tapahtumia (vain kehittäjille)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
-msgstr "Tuo outlook-viestejä PST-tiedostosta."
+msgstr "Tuo Outlook-viestejä PST-tiedostosta"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
@@ -18921,31 +18787,35 @@ msgstr "Outlookin PST-tuoja"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlookin omat kansiot (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "_Sähköposti"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "Kohdekansio:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tehtävät"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "_Päiväkirjamerkinnät"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "Tuodaan tietoja Outlookista"
 
@@ -18987,7 +18857,7 @@ msgstr "Julkaisu kohteeseen %s onnistui"
 #: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "Kohteen %s liittäminen epäonnistui."
+msgstr "Kohteen %s liittäminen epäonnistui:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:596
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
@@ -19007,15 +18877,15 @@ msgstr "Julkaisusäiettä ei voitu luoda."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
-msgstr "Julkaise kalenteritietoja"
+msgstr "_Julkaise kalenteritietoja"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Custom Location"
-msgstr ""
+msgstr "Mukautettu sijainti"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
-msgstr ""
+msgstr "Päivittäin"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "FTP (with login)"
@@ -19023,7 +18893,7 @@ msgstr "FTP (sisäänkirjautumisen vaativa)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Manual (via Actions menu)"
-msgstr ""
+msgstr "Käsin (Toiminnot-valikon kautta)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
@@ -19039,15 +18909,15 @@ msgstr "Julkaisupaikka"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
-msgstr "Julkaisutiheys:"
+msgstr "Julkaisu_tiheys:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
-msgstr ""
+msgstr "Salattu FTP (SSH)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
-msgstr ""
+msgstr "Salattu WebDAV (HTTPS)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
@@ -19055,7 +18925,7 @@ msgstr "Palvelun _tyyppi:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Sources"
-msgstr ""
+msgstr "Lähteet"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
@@ -19067,7 +18937,7 @@ msgstr "WebDAV (HTTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Weekly"
-msgstr ""
+msgstr "Viikoittain"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Windows share"
@@ -19112,49 +18982,49 @@ msgstr "Uusi sijainti"
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:127
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Spamassassinia ei löytynyt, paluukoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:135
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:143
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Putken luonti epäonnistui: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:182
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Virhe forkkauksen jälkeen: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:237
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassinin lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:239
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Spamassassinin lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:248
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Putki spamassassinille epäonnistui, virhekoodi: %d"
+msgstr "Putki Spamassassinille epäonnistui, virhekoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:511
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
-msgstr ""
+msgstr "SpamAssassin ei ole käytettävissä. Asenna se ensin."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:938
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
-msgstr "Lisää myös etätestit"
+msgstr "_Lisää myös etätestit"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Filter junk messages using SpamAssassin."
@@ -19168,7 +19038,7 @@ msgstr "Spamassassin-roskapostisuodatin"
 msgid "SpamAssassin Options"
 msgstr "Spamassassin-valitsimet"
 
-#. 
+#.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
@@ -19256,7 +19126,7 @@ msgstr "Tallenna valittu"
 msgid "Save a calendar or task list to disk."
 msgstr "Tallenna kalenteri tai tehtävälista levylle."
 
-#. 
+#.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
@@ -19269,77 +19139,25 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF-muoto (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
-msgstr "Tallenna valittu tehtävälista levylle."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Ohjaa tilin asetusten määrittelyssä ensikäynnistyksellä."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Asetusapulainen"
-
-#: ../plugins/startup-wizard/startup-wizard.c:119
-msgid "Evolution Setup Assistant"
-msgstr "Evolutionin asetusapulainen"
-
-#: ../plugins/startup-wizard/startup-wizard.c:124
-msgid "Welcome"
-msgstr "Tervetuloa"
-
-#: ../plugins/startup-wizard/startup-wizard.c:127
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Tervetuloa Evolutioniin. Seuraavaksi kysyttävien tietojen avulla Evolution "
-"ottaa yhteyttä sähköpostitileihisi ja tuo tarvittavia tietoja muista "
-"sovelluksista.\n"
-"\n"
-"Jatka painamalla \"Eteenpäin\"-painiketta. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:162
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Valitse tieto jota haluaisit tuoda:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:177
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "Ohjelmasta %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:194
-msgid "Importing files"
-msgstr "Tiedostojen tuonti"
-
-#: ../plugins/startup-wizard/startup-wizard.c:257
-msgid "Importing data."
-msgstr "Tuodaan tietoja."
-
-#: ../plugins/startup-wizard/startup-wizard.c:259
-msgid "Please wait"
-msgstr "Odota, ole hyvä"
+msgstr "Tallenna valittu tehtävälista levylle"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
@@ -19354,7 +19172,7 @@ msgid "Thread messages by subject"
 msgstr "Säikeistä viestit aiheen perusteella"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
@@ -19370,15 +19188,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Pohjiin perustuva mallilisäosa"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:621
 msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:715
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:717
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
@@ -19398,27 +19216,27 @@ msgstr "Sisäkkäiset vCard-tiedostot"
 msgid "Show vCards directly in mail messages."
 msgstr "Näytä vCard-liitteet sähköpostiviestin sisällä."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "Näytä koko vCardin"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "Näytä tiivistetty vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "Löytyi yksi muu yhteystieto."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "Löytyi %d muu yhteystieto"
+msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "Tallenna osoitekirjaan"
 
@@ -19434,13 +19252,13 @@ msgstr "WebDAV-yhteystiedot"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Vältä IfMatch-komentoa (vaaditaan apache-versiolle < 2.2.8)"
+msgstr "_Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
@@ -19480,7 +19298,7 @@ msgstr "Ikkunan oletusleveys"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Enable express mode"
-msgstr ""
+msgstr "Ota pikatila käyttöön"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
@@ -19491,7 +19309,7 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
-msgstr ""
+msgstr "Ottaa käyttöön paljon yksinkertaistetun käyttöliittymän."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
@@ -19516,16 +19334,14 @@ msgstr "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the "
-"\"/apps/evolution/shell/network_config/authentication_user\" GConf key, and "
-"the password is retrieved from either gnome-keyring or the "
-"~/.gnome2_private/Evolution password file."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 "Jos tosi, vaativat yhteyden välipalvelimelle tunnistautumisen. "
-"Käyttäjätunnus otetaan avaimesta "
-"\"/apps/evolution/shell/network_config/authentication_user\" ja salasana "
-"luetaan joko gnome-keyring -avainrenkaasta tai tiedostosta "
-"~/.gnome2_private/Evolution."
+"Käyttäjätunnus otetaan avaimesta \"/apps/evolution/shell/network_config/"
+"authentication_user\" ja salasana luetaan joko gnome-keyring -avainrenkaasta "
+"tai tiedostosta ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19590,8 +19406,8 @@ msgstr "Salatun HTTP-välipalvelimen portti"
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig "
-"url\" respectively."
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
 msgstr ""
 "Valitse välipalvelimen asetustila. Tuetut arvot ovat 0, 1, 2, ja 3, jotka "
 "tarkoittavat arvoja \"käytä järjestelmän asetuksia\", \"ei välipalvelinta\", "
@@ -19606,7 +19422,7 @@ msgstr "Sivupaneeli on näkyvissä"
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:349
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:341
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -19619,7 +19435,7 @@ msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
-"Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
+"Evolutionin konfiguraatioversio, major/minor/configuration-tasoilla "
 "(esimerkiksi \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
@@ -19644,11 +19460,11 @@ msgstr "Sivupaneelin oletusleveys pikseleinä."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
-"The last upgraded configuration version of Evolution, with "
-"major/minor/configuration level (for example \"2.6.0\")."
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
-"Viimeisin päivitetty Evolutionin konfiguraatioversio, "
-"major/minor/configuration tasoilla (esimerkiksi \"2.6.0\")."
+"Viimeisin päivitetty Evolutionin konfiguraatioversio, major/minor/"
+"configuration-tasoilla (esimerkiksi \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
@@ -19664,30 +19480,27 @@ msgstr "Verkkonimi, jota käytetään SOCKS-välipalvelimena."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
-"The port on the machine defined by "
-"\"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
 msgstr ""
-"Portti, jonka kautta käytetään avaimessa "
-"\"/apps/evolution/shell/network_config/http_host\" määriteltyä "
-"välipalvelinta."
+"Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
+"network_config/http_host\" määriteltyä välipalvelinta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
-"The port on the machine defined by "
-"\"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
 msgstr ""
-"Portti, jonka kautta käytetään avaimessa "
-"\"/apps/evolution/shell/network_config/secure_host\" määriteltyä "
-"välipalvelinta."
+"Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
+"network_config/secure_host\" määriteltyä välipalvelinta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
-"The port on the machine defined by "
-"\"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
 msgstr ""
-"Portti, jonka kautta käytetään avaimessa "
-"\"/apps/evolution/shell/network_config/socks_host\" määriteltyä "
-"välipalvelinta."
+"Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
+"network_config/socks_host\" määriteltyä välipalvelinta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
@@ -19728,8 +19541,7 @@ msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-välipalvelimelle tunnistautumiseen käytetty käyttäjätunnus."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid ""
-"Whether Evolution will start up in offline mode instead of online mode."
+msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Käynnistetäänkö Evolution verkkoyhteyksillä vai ilman."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
@@ -19766,55 +19578,34 @@ msgstr "Ikkunan painikkeiden tyyli"
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
-#: ../shell/e-shell-content.c:499 ../shell/e-shell-content.c:500
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "Haut"
 
-#: ../shell/e-shell-content.c:541
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:920
+#: ../shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "Nä_ytä:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:951
+#: ../shell/e-shell-searchbar.c:960
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1012
+#: ../shell/e-shell-searchbar.c:1021
 msgid "i_n"
 msgstr "lä_hteestä"
 
-#: ../shell/e-shell-switcher.c:463
-msgid "Toolbar Style"
-msgstr "_Työkalupalkin tyyli"
-
-#: ../shell/e-shell-switcher.c:464
-msgid "The switcher's toolbar style"
-msgstr "Vaihtimen työkalupalkin tyyli"
-
-#: ../shell/e-shell-switcher.c:480 ../shell/e-shell-window.c:820
-msgid "Toolbar Visible"
-msgstr "Työkalupalkki näkyvissä"
-
-#: ../shell/e-shell-switcher.c:481
-msgid "Whether the switcher is visible"
-msgstr "Näytetäänkö valitsin"
-
 #: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
@@ -19827,92 +19618,17 @@ msgstr "iCalendar (.ics)"
 msgid "All Files (*)"
 msgstr "Kaikki tiedostot (*)"
 
-#: ../shell/e-shell-view.c:807
-msgid "Switcher Action"
-msgstr "Vaihtimen toiminto"
-
-#: ../shell/e-shell-view.c:808
-msgid "The switcher action for this shell view"
-msgstr "Tämän kuorinäkymän vaihtimen toiminto"
-
-#: ../shell/e-shell-view.c:823
-msgid "Page Number"
-msgstr "Sivunumero"
-
-#: ../shell/e-shell-view.c:824
-msgid "The notebook page number of the shell view"
-msgstr "Tämän kuorinäkymä välilehden sivunumero"
-
-#: ../shell/e-shell-view.c:840
-msgid "Search Rule"
-msgstr ""
-
-#: ../shell/e-shell-view.c:841
-msgid "Criteria for the current search results"
-msgstr ""
-
-#: ../shell/e-shell-view.c:856
-msgid "The EShellBackend for this shell view"
-msgstr "Tämän kuorinäkymän EShellBackend"
-
-#: ../shell/e-shell-view.c:871
-msgid "Shell Content Widget"
-msgstr "Kuoren sisältöelementti"
-
-#: ../shell/e-shell-view.c:872
-msgid "The content widget appears in a shell window's right pane"
-msgstr "Sisältöelementti näytetään kuori-ikkunan oikeana paneelina"
-
-#: ../shell/e-shell-view.c:888
-msgid "Shell Sidebar Widget"
-msgstr "Kuoren sivupalkkielementti"
-
-#: ../shell/e-shell-view.c:889
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "Sivupalkkielementti näytetään kuori-ikkunan vasempana paneelina"
-
-#: ../shell/e-shell-view.c:904
-msgid "Shell Taskbar Widget"
-msgstr "Kuoren tehtävälistaelementti"
-
-#: ../shell/e-shell-view.c:905
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Tehtävälistaelementti näytetään kuori-ikkunan alaosassa"
-
-#: ../shell/e-shell-view.c:920
-msgid "Shell Window"
-msgstr "Kuoren ikkuna"
-
-#: ../shell/e-shell-view.c:921
-msgid "The window to which the shell view belongs"
-msgstr "Ikkuna, johon kuorinäkymä kuuluu"
-
-#: ../shell/e-shell-view.c:937
-msgid "The key file holding widget state data"
-msgstr ""
-
-#: ../shell/e-shell-view.c:952
-msgid "The title of the shell view"
-msgstr "Kuorinäkymän otsikko"
-
-#: ../shell/e-shell-view.c:966
-msgid "Current View ID"
-msgstr "Nykyisen näkymän tunniste"
-
-#: ../shell/e-shell-view.c:967
-msgid "The current GAL view ID"
-msgstr "Nykyisen GAL-näkymän tunniste"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:647
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
 "Jarkko Ranta, 2000-2001\n"
+"Ville-Pekka Vainio, 2010\n"
 "\n"
 "http://gnome.fi/\n";
 "\n"
@@ -19932,417 +19648,305 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
 "  papukaija https://launchpad.net/~papukaija";
 
-#: ../shell/e-shell-window-actions.c:658
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-actions.c:1233
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-actions.c:1235
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../shell/e-shell-window-actions.c:1352
-msgid "GNOME Pilot is not installed."
-msgstr "Gnome-pilotia ei ole asennettu."
-
-#: ../shell/e-shell-window-actions.c:1354
-msgid "GNOME Pilot could not be run."
-msgstr "Gnome-pilotia ei voitu suorittaa."
-
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Avaa usein kysyttyjen kysymysten www-sivu"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "_Unohda salasanat"
 
-#: ../shell/e-shell-window-actions.c:1511
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "Unohda kaikki tallennetut salasanat"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "Näytä Evolutionin pikanäppäimet"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "Lähetä _vikailmoitus..."
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../shell/e-shell-window-actions.c:1621
-msgid "GNOME Pilot _Synchronization..."
-msgstr ""
-
-#: ../shell/e-shell-window-actions.c:1623
-msgid "Set up GNOME Pilot configuration"
-msgstr ""
-
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "_Asettelu"
 
-#: ../shell/e-shell-window-actions.c:1672
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../shell/e-shell-window-actions.c:1686
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
-msgstr ""
+msgstr "Näytä työkalurivi"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../shell/e-shell-window-actions.c:1786
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1791
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../shell/e-shell-window-actions.c:1793
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "Määrittele näkymät..."
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "Luo tai muokkaa näkymiä"
 
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1824
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1834
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../shell/e-shell-window-actions.c:1836
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1846
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../shell/e-shell-window-actions.c:2228
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell-window-actions.c:2441
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:575
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
-msgstr "%s - evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:414
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "Uusi"
 
-#: ../shell/e-shell-window.c:696
-msgid "Active Shell View"
-msgstr "Aktiivinen tulkkinäkymä"
-
-#: ../shell/e-shell-window.c:697
-msgid "Name of the active shell view"
-msgstr "Aktiivisen tulkkinäkymän nimi"
-
-#: ../shell/e-shell-window.c:712
-msgid "The shell window's EFocusTracker"
-msgstr ""
-
-#: ../shell/e-shell-window.c:726 ../shell/e-shell.c:883
-msgid "Geometry"
-msgstr ""
-
-#: ../shell/e-shell-window.c:727 ../shell/e-shell.c:884
-msgid "Initial window geometry string"
-msgstr ""
-
-#: ../shell/e-shell-window.c:742
-msgid "Safe Mode"
-msgstr "Turvallinen tila"
-
-#: ../shell/e-shell-window.c:743
-msgid "Whether the shell window is in safe mode"
-msgstr "Onko tulkki-ikkuna turvallisessa tilassa"
-
-#: ../shell/e-shell-window.c:774
-msgid "Sidebar Visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:775
-msgid "Whether the shell window's side bar is visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:789
-msgid "Switcher Visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:790
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:805
-msgid "Taskbar Visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:806
-msgid "Whether the shell window's task bar is visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:821
-msgid "Whether the shell window's tool bar is visible"
-msgstr ""
-
-#: ../shell/e-shell-window.c:835
-msgid "UI Manager"
-msgstr "UI-hallinta"
-
-#: ../shell/e-shell-window.c:836
-msgid "The shell window's GtkUIManager"
-msgstr "Tulkki-ikkunan GtkUIManager"
-
-#: ../shell/e-shell.c:224
+#: ../shell/e-shell.c:244
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:274
+#: ../shell/e-shell.c:294
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/e-shell.c:342
+#: ../shell/e-shell.c:353
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell.c:899
-msgid "Module Directory"
-msgstr ""
-
-#: ../shell/e-shell.c:900
-msgid "The directory from which to load EModules"
-msgstr ""
-
-#: ../shell/e-shell.c:915
-msgid "Network Available"
-msgstr "Verkko käytettävissä"
-
-#: ../shell/e-shell.c:916
-msgid "Whether the network is available"
-msgstr "Onko verkko käytettävissä"
-
-#: ../shell/e-shell.c:931 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Verkossa"
-
-#: ../shell/e-shell.c:932
-msgid "Whether the shell is online"
-msgstr "Onko tulkki verkossa"
-
-#: ../shell/e-shell.c:947
-msgid "Shell Settings"
-msgstr "Kuoren asetukset"
-
-#: ../shell/e-shell.c:948
-msgid "Application-wide settings"
-msgstr "Ohjelmanlaajuiset asetukset"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:179
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20378,7 +19982,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:203
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20386,60 +19990,55 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:221
 msgid "Do not tell me again"
 msgstr "�lä kerro tätä uudestaan"
 
-#: ../shell/main.c:345
+#: ../shell/main.c:337
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:347
+#: ../shell/main.c:339
 msgid "Apply the given geometry to the main window"
-msgstr ""
+msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:343
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:353
+#: ../shell/main.c:345
 msgid "Start in \"express\" mode"
-msgstr ""
+msgstr "Käynnistä â??pikatilassaâ??"
 
-#: ../shell/main.c:356
+#: ../shell/main.c:348
 msgid "Forcibly shut down Evolution"
-msgstr ""
+msgstr "Sammuta Evolution väkisin"
 
-#: ../shell/main.c:360
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Tuo tiedot väkisin uudestaan Evolution 1.4:stä"
-
-#: ../shell/main.c:363
+#: ../shell/main.c:351
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:365
+#: ../shell/main.c:353
 msgid "Disable loading of any plugins."
 msgstr "�lä lataa mitään lisäosia."
 
-#: ../shell/main.c:367
+#: ../shell/main.c:355
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
-"Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
+msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../shell/main.c:371
+#: ../shell/main.c:359
 msgid "Import URIs or file names given as rest of arguments."
-msgstr ""
+msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../shell/main.c:373
+#: ../shell/main.c:361
 msgid "Request a running Evolution process to quit"
-msgstr ""
+msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../shell/main.c:496
+#: ../shell/main.c:505 ../shell/main.c:513
 msgid "- The Evolution PIM and Email Client"
 msgstr ", sähköposti- ja ajanhallintaohjelma"
 
-#: ../shell/main.c:556
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20453,95 +20052,43 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Haluatko varmasti unohtaa kaikki muistetut salasanat?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Jatka"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Versiosta {0} ei voi päivittää suoraan"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Poistetaanko vanhat tiedot versiosta {0}"
+msgid "Continue Anyway"
+msgstr "Jatka silti"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution ei enää tue päivittämistä suoraan versiosta {0}. Kiertokeinona "
+"voit kokeilla päivittää ensin Evolutionin versioon 2 ja sitten versioon 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Salasanojen unohtaminen tyhjentää kaikki tallennetut salasanat. Salasanaa "
 "kysytään uudestaan, kun sitä seuraavan kerran tarvitaan."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Levytila ei riitä päivitykseen."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Poistetaanko vanhat tiedot varmasti?"
+msgid "Quit Now"
+msgstr "Lopeta nyt"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"Hakemisto &quot;evolution&quot; sisältöineen ollaan poistamassa pysyvästi.\n"
-"\n"
-"On suositeltavaa tarkistaa, että kaikki sähköpostisi, yhteystietosi ja "
-"kalenterimerkintäsi ovat olemassa ja että tämä Evolutionin versio toimii "
-"oikein ennen kuin nämä vanhat tiedot poistetaan.\n"
-"\n"
-"Kun vanhat tiedot on poistettu, et voi vaihtaa helposti takaisin vanhaan "
-"versioon ja saada tietojasi näkyviin ilman käsityötä.\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the "
-"&quot;evolution&quot; directory will be removed permanently. If you choose "
-"to keep this data, then you may manually remove the contents of "
-"&quot;evolution&quot; at your convenience.\n"
-msgstr ""
-"Evolutionin edellinen versio tallensi tiedot eri paikkaan.\n"
-"\n"
-"Jos päätät poistaa nämä tiedot, poistetaan hakemisto &quot;evolution&quot; "
-"sisältöineen pysyvästi. Jos päätät pitää nämä tiedot, voit itse poistaa "
-"hakemiston &quot;evolution&quot; myöhemmin.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Päivitys edellisestä versiosta epäonnistui:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Tietojesi ja asetuksiesi päivittäminen voi vaatia {0} levytilaa, mutta vain "
-"{1} on vapaana.\n"
-"Sinun täytyy vapauttaa enemmän tilaa kotihakemistostasi ennen kuin voit "
-"jatkaa."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Säilytä tiedot"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Muistuta myöhemmin"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20633,7 +20180,7 @@ msgstr "Istunnonhallinnan valitsimet:"
 msgid "Show session management options"
 msgstr "Näytä istunnonhallinnan valinnat"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20662,59 +20209,67 @@ msgstr ""
 "Koska et luota varmentajaan, joka myönsi tämän varmenteen, et "
 "automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "Käyttäjän varmenteen tuonti epäonnistui"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "Käyttötarkoitus"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "Vanhenemispäivä"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "Yhteystiedon varmenteen tuonti epäonnistui"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
-#: ../smime/gui/certificate-manager.c:1058
-msgid "Certificates"
-msgstr "Varmenteet"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "Varmenteen myöntäjän varmenteen tuonti epäonnistui"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Varmenteen katselin: %s"
@@ -20752,7 +20307,7 @@ msgstr ""
 "Myöntäjä:\n"
 " Käyttö: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Valitse varmenne"
 
@@ -20765,14 +20320,10 @@ msgid "Authorities"
 msgstr "Varmentajat"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Varmuuskopioi"
+msgid "Backup _All"
+msgstr "Varmuuskopioi _kaikki"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Varmuuskopioi kaikki"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20780,162 +20331,153 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
-msgstr ""
+msgstr "Varmenteen kentät"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
-msgstr ""
+msgstr "Varmennehierarkia"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Varmenteen yksityiskohdat"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Varmennetaulu"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Julkinen nimi (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Tuttavien varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "�lä luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Varmenteen luottamuksen asetukset"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Sähköpostin vastaanottajan varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Sähköpostin allekirjoittajan varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Vanhenee"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
-msgstr ""
+msgstr "Kentän arvo"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
-msgstr ""
-
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Tuo"
+msgstr "Sormenjäljet"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
-msgstr ""
+msgstr "Myöntäjä"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Myönnetty"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
-msgstr ""
+msgstr "Myönnetty"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 sormenjälki"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisaatio (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Organisaatioyksikkö (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sormenjälki"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL-asiakkaan varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL-palvelimen varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
-msgstr ""
+msgstr "Tämä varmenne on todennettu seuraaviin käyttötarkoituksiin:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Luota tähän CA:han sähköpostikäyttäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Luota tähän CA:han ohjelmistokehittäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "Luota tähän CA:han www-sivustojen tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
-msgstr ""
+msgstr "Kelvollisuus"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Näytä"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Seuraavien organisaatioiden varmenteet varmentavat identiteettisi:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
+msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Omat varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "_Varmuuskopioi"
+
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:686
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
@@ -20980,125 +20522,143 @@ msgstr "PKCS #1 MD5 RSA-salauksella"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 RSA-salauksella"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 RSA-salauksella"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 RSA-salauksella"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-salaus"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Varmenneavaimen käyttö"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape-varmenteen tyyppi"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Varmentajan avaintunniste"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Kohteen tunniste (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Algoritmin tunniste"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Algoritmin parametrit"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Aiheen julkisen avaimen tiedot"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Aiheen julkisen avaimen algoritmi"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Kohteen julkinen avain"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Virhe: laajennosta ei voi käsitellä"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Kohteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL-varmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Sähköpostivarmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Allekirjoitus"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Kiistämättömyys"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Avaimen salakoodaus"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Tiedon salakoodaus"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Avaimen sopimus"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Varmenteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Ei-kriittinen"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "Laajennokset"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Varmenteen allekirjoitusalgoritmi"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "Myöntäjän yksilöllinen ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "Kohteen yksilöllinen tunniste"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
@@ -21128,15 +20688,15 @@ msgstr "_Luettelonäkymä"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "Viikkonäkymä"
+msgstr "_Viikkonäkymä"
 
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr "Päivänäkymä"
+msgstr "_Päivänäkymä"
 
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
-msgstr "Kuukausinäkymä"
+msgstr "_Kuukausinäkymä"
 
 #: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
@@ -21144,7 +20704,7 @@ msgstr "Työviikk_onäkymä"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr "Lähetetyt-kansion mukaan leveässä näkymässä"
+msgstr "Lähetetyt-kansion mukaan _leveässä näkymässä"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -21187,17 +20747,17 @@ msgid "With _Status"
 msgstr "_Tilan kanssa"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
-msgstr "Valitse _aikavyöhyke"
+msgstr "Valitse aikavyöhyke"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
 msgid "Time Zones"
@@ -21219,21 +20779,16 @@ msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
 msgid "_Selection"
-msgstr ""
-
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Kokoelma"
+msgstr "_Valinta"
 
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Määrittele näkymät - %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "Määrittele näkymät"
 
@@ -21246,10 +20801,6 @@ msgstr "Määrittele %s näkymät"
 msgid "Table"
 msgstr "Taulu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Tapahtumiskerta"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Tallenna nykyinen näkymä"
@@ -21262,11 +20813,7 @@ msgstr "Luo uusi _näkymä"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Tehdas"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Määrittele uusi näkymä"
 
@@ -21282,129 +20829,122 @@ msgstr "Näkymän tyyppi"
 msgid "Type of view:"
 msgstr "Näkymän tyyppi:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Tilin nimi"
-
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Toiminto"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
-
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "_Tiedostonimi:"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
-msgstr "MIME-tyyppi"
+msgstr "MIME-tyyppi:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "Ei voitu asettaa taustakuvaksi"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "Aseta _taustakuvaksi"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Liitettä ei voitu lähettää"
 msgstr[1] "Liitteitä ei voitu lähettää"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "_Lähetä..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "Lähetä valitut liitteet jonnekin"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "Ladataan"
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../widgets/misc/e-attachment-paned.c:605
-msgid "Show _Attachment Bar"
-msgstr "Näytä _liitepalkki"
-
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:401
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:408
+msgid "Hid_e All"
+msgstr "_Piilota kaikki"
+
+#: ../widgets/misc/e-attachment-view.c:415
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:422
+msgid "Vie_w All Inline"
+msgstr "_Näytä kaikki sisäkkäisesti"
+
+#: ../widgets/misc/e-attachment-view.c:739
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Avaa ohjelmassa \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:742
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tämä liite ohjelmalla %s"
@@ -21413,240 +20953,202 @@ msgstr "Avaa tämä liite ohjelmalla %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1928
 #, c-format
 msgid "Could not load '%s'"
 msgstr "%s ei voitu ladata"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1931
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
 msgstr "%s ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2210
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2721
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2724
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
-msgstr ""
+msgstr "Ctrl-napsauta avataksesi linkin"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1254
+#: ../widgets/misc/e-calendar-item.c:1258
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Täytön väri"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK:n täyttöväri"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Täytön kuviopeite"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Minimileveys"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Minimileveys"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Välistys"
-
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "Merkistön koodaus"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "Muut..."
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:505
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:526
 msgid "Text entry to input date"
 msgstr "Tekstikenttä päiväyksen syöttöön"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:548
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:672
 msgid "_Today"
 msgstr "_Tänään"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:680
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../widgets/misc/e-dateedit.c:1813
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../widgets/misc/e-dateedit.c:1857
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr ""
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
 "like to try again, please click the \"Back\" button."
 msgstr ""
+"Evolution etsi tuotavia asetuksia seuraavista ohjelmista: Pine, Netscape, "
+"Elm, iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla "
+"uudestaan, napsauta â??Takaisinâ??-painiketta."
+
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:773
+msgid "_Cancel Import"
+msgstr "_Peru tuonti"
+
+#: ../widgets/misc/e-import-assistant.c:915
+msgid "Preview data to be imported"
+msgstr "Esikatsele tuotavia tietoja"
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
+msgid "Import Data"
+msgstr "Tuo tiedot"
+
+#: ../widgets/misc/e-import-assistant.c:929
+msgid "Select what type of file you want to import from the list."
+msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
+
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Evolution Import Assistant"
-msgstr "Evolutionin tuoden asetukset"
+msgstr "Evolutionin tuontiapulainen"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21656,173 +21158,96 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
 "Evolutionin käyttöön."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr ""
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:557
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:559
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
-"käyttäjät voivat valita aikavyöhykkeen allaolevasta pudotusvalikosta."
+"käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
+msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
+msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "Napin tila on verkossa"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Vaakasijainti"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Pystysijainti"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Paneelin sijainti sen ollessa pystyasennossa"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr ""
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Synkronoi:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Synkronisoi yksityiset tietueet:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Synkronointiluokat:"
-
-#: ../widgets/misc/e-preferences-window.c:266
+#: ../widgets/misc/e-preferences-window.c:278
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:622
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:660
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:682
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Kohdistimen rivi"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Kohdistimen sarake"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Järjestäjä"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Valintatila"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Kohdistintila"
-
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
@@ -21832,7 +21257,7 @@ msgstr "Poista lähetetty _automaattisesti"
 
 #: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
-msgstr "Luo lähetyskohde, jonka tietoja seurataan"
+msgstr "_Luo lähetyskohde, jonka tietoja seurataan"
 
 #: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
@@ -21840,138 +21265,151 @@ msgstr "_Toimitettu ja avattu"
 
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Delivery Options"
-msgstr ""
+msgstr "Toimitusvalinnat"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgid "For Your Eyes Only"
-msgstr ""
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Kunnes"
 
 #: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Jälkeen"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "päivää"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "S_isällä"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "päivää"
+
+#: ../widgets/misc/e-send-options.ui.h:11
+msgid "For Your Eyes Only"
+msgstr "Vain sinulle"
+
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "_Yleisasetukset"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
-msgstr ""
+msgstr "Sähköpostin vastaanotto"
 
-#: ../widgets/misc/e-send-options.ui.h:12
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
-msgstr ""
+msgstr "Tavallinen"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
-msgstr ""
+msgstr "Tilan seuranta"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "Erittäin salainen"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "Milloin hy_väksytty:"
 
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "Milloin val_mistuu:"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "Milloin h_ylätty:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Wi_thin"
-msgstr "S_isällä"
-
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_After:"
-msgstr "_Jälkeen:"
-
-#: ../widgets/misc/e-send-options.ui.h:28
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
 msgstr "_Kaikki tiedot"
 
-#: ../widgets/misc/e-send-options.ui.h:29
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "Lu_okittelu:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "_Viivästä viestin toimitusta"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_Toimitettu"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "Aseta _eräpäivä"
 
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Until:"
-msgstr "_Kunnes:"
-
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "Milloin _sopii"
 
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "_Milloin avattu:"
 
 #. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:40
 msgctxt "send-options"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:555
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:422
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:437
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
 msgid "Add Signature Script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
 msgid "Edit Signature Script"
 msgstr "Muokkaa allekirjoitus-skriptiä"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21981,53 +21419,53 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "_Skripti:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "Skriptitiedoston tulee olla suoritettavissa."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "Napsauta tästä avataksesi URLin"
 
-#: ../widgets/misc/e-web-view.c:364
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../widgets/misc/e-web-view.c:366
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../widgets/misc/e-web-view.c:374
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../widgets/misc/e-web-view.c:376
+#: ../widgets/misc/e-web-view.c:386
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../widgets/misc/e-web-view.c:384
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1039
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
-msgstr ""
+msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../widgets/misc/e-web-view.c:804 ../widgets/misc/e-web-view.c:806
-#: ../widgets/misc/e-web-view.c:808
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../widgets/misc/e-web-view.c:810
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../widgets/misc/e-web-view.c:812
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
@@ -22046,25 +21484,25 @@ msgstr "Kalenteri väliltä %s - %s"
 msgid "evolution calendar item"
 msgstr "evolutionin kalenterin kohta"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:300
 msgid "Now"
 msgstr "Nyt"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:869
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -22073,79 +21511,43 @@ msgstr "Ajan tulee olla muodossa: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Valittu sarake"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Kohdistettu sarake"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Valitsematon sarake"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Yliviivattu sarake"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Alleviivaa sarake"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Vahva sarake"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Värillinen sarake"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Taustan värinen sarake"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "lisää napsauttamalla"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Tila"
-
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(nouseva)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(laskeva)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Ei järjestetty"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Ei ryhmitystä"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Näytä kentät"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Valittavat kentät"
 
 #: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
-msgstr "Valittavat kentät:"
+msgstr "_Valittavat kentät:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -22158,7 +21560,7 @@ msgid "Clear _All"
 msgstr "Tyhjennä k_aikki"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -22218,9 +21620,9 @@ msgstr "_Näytä kentät järjestyksessä:"
 msgid "_Sort..."
 msgstr "_Järjestä..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
-msgstr ""
+msgstr "Lisää sarake"
 
 #: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
@@ -22230,248 +21632,107 @@ msgstr ""
 "Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvän."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d kohta)"
-msgstr[1] "%s : %s (%d kohtaa)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d kohta)"
+msgstr[1] "%s: %s (%d kohtaa)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Vaihtelevat rivien värit"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Vaakasuuntainen piirtoristikko"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Pystysuuntainen piirtoristikko"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Piirron kohdistin"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Kursorin tila"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Valintamalli"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Pituuden raja-arvo"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Yhtenäinen rivinkorkeus"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Jäädytetty"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "Poista _järjestys"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
-msgstr "Lisää sarake..."
+msgstr "Lisää _sarake..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistä näkymää..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Taulukon otsikko"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Taulumalli"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Kohdistimen rivi"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Tietoja järjestyksestä"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Etsi aina"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Lisää napsauttamalla"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr ""
-
-#: ../widgets/table/e-table.c:3375
-msgid ""
-"Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree-taulukon adapteri"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Retro-ulkoasu"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Piirrä viivat ja +/- laajentimet."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Laajentimen koko"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Laajennusnuolen koko"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ponnahdusikkuna"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "Ponnauta lapsi"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "muokkaa"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "muokkaa tätä solua"
-
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "vaihtele"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "Vaihtele solun näkyvyyttä"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "laajenna"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "piilota"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tämän solun sisältävä ETreen rivi"
 
@@ -22487,130 +21748,1064 @@ msgstr "napsauta"
 msgid "sort"
 msgstr "järjestä"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2536
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2548
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Tapahtumaprosessori"
+#~ msgid "{0}"
+#~ msgstr "{0}"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Teksti"
+#~ msgid "{1}"
+#~ msgstr "{1}"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Vahva"
+#~ msgid "Default Sync Address:"
+#~ msgstr "Synkronoinnin oletusosoite:"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Yliviivattu"
+#~ msgid "Could not load address book"
+#~ msgstr "Osoitekirjaa ei voitu ladata"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ankkuri"
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voi lukea"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Asemointi"
+#~ msgid "_Web Log:"
+#~ msgstr "_Web-lokin osoite:"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Leikkeen leveys"
+#~ msgid "Editable"
+#~ msgstr "Muokattava"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Leikkeen korkeus"
+#~ msgid "Source Book"
+#~ msgstr "Lähdekirja"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Leike"
+#~ msgid "Target Book"
+#~ msgstr "Kohdekirja"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Täytä leikkauksen suorakulmio"
+#~ msgid "Is New Contact"
+#~ msgstr "Uusi yhteystieto"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X-offset"
+#~ msgid "Writable Fields"
+#~ msgstr "Muokattavat kentät"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y-offset"
+#~ msgid "Required Fields"
+#~ msgstr "Vaaditut kentät"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Tekstin leveys"
+#~ msgid "Changed"
+#~ msgstr "Muutettu"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Tekstin korkeus"
+#~ msgid "Shell"
+#~ msgstr "Tulkki"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Käytä ellipsejä"
+#~ msgid "The EShell singleton"
+#~ msgstr "EShell-yksikkö"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Ellipsit"
+#~ msgid "Book"
+#~ msgstr "Kirja"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Rivitys"
+#~ msgid "Is New List"
+#~ msgstr "Uusi lista"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Katkaisevat merkit"
+#~ msgid "Query"
+#~ msgstr "Kysely"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Rivejä enintään"
+#~ msgid "Model"
+#~ msgstr "Malli"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Piirrä reunat"
+#~ msgid "Shell View"
+#~ msgstr "Kuorinäkymä"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Salli rivinvaihdot"
+#~ msgid "Source"
+#~ msgstr "Lähde"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Piirrä tausta"
+#~ msgid "Width"
+#~ msgstr "Leveys"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Piirrä nappi"
+#~ msgid "Height"
+#~ msgstr "Korkeus"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Kohdistimen sijainti"
+#~ msgid "Has Focus"
+#~ msgstr "On kohdistettu"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM-konteksti"
+#~ msgid "Field"
+#~ msgstr "Kenttä"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Kahvan ponnahdusikkuna"
+#~ msgid "Field Name"
+#~ msgstr "Kentän nimi"
 
-#: ../debian/signature.py:8
-msgid "Sent from Ubuntu"
-msgstr ""
+#~ msgid "Text Model"
+#~ msgstr "Tekstimalli"
+
+#~ msgid "Max field name length"
+#~ msgstr "Kentän maksimipituus"
+
+#~ msgid "Column Width"
+#~ msgstr "Sarakkeen leveys"
+
+#~ msgid "Adapter"
+#~ msgstr "Sovitin"
+
+#~ msgid "Selected"
+#~ msgstr "Valittu"
+
+#~ msgid "Has Cursor"
+#~ msgstr "On kohdistin"
+
+#~ msgid "Success"
+#~ msgstr "Onnistui"
+
+#~ msgid "Backend busy"
+#~ msgstr "Taustajärjestelmä käytössä"
+
+#~ msgid "Repository offline"
+#~ msgstr "Lähde poissa käytöstä"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "Osoitekirjaa ei ole olemassa"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "Omaa yhteystietoa ei ole määritelty"
+
+#~ msgid "Permission denied"
+#~ msgstr "Lupa evätty"
+
+#~ msgid "Contact not found"
+#~ msgstr "Yhteystietoa ei löytynyt"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "Yhteystiedon tunniste on jo olemassa"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protokolla ei ole tuettu"
+
+#~ msgid "Could not cancel"
+#~ msgstr "Ei voi perua"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "Todennus epäonnistui"
+
+#~ msgid "Authentication Required"
+#~ msgstr "Todennus vaaditaan"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS ei ole käytettävissä"
+
+#~ msgid "No such source"
+#~ msgstr "Lähdettä ei ole olemassa"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "Ei käytettävissä yhteydettömässä tilassa"
+
+#~ msgid "Other error"
+#~ msgstr "Muu virhe"
+
+#~ msgid "Invalid server version"
+#~ msgstr "Virheellinen palvelimen versio"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "Tunnistautumistapa ei ole tuettu"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Kalenterilähde on yhteydettömässä tilassa."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Virhe palvelimella \"{0}\""
+
+#~ msgid "No response from the server."
+#~ msgstr "Palvelin ei vastannut."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Kalenteria ei voitu ladata"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "Jaa usean päivän tapahtumat:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "Pilotin kalenterin ohjelmalohkoa ei voi lukea"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
+
+#~ msgid "Default Priority:"
+#~ msgstr "Prioriteetin oletusarvo:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi lukea"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "Tapahtumaa ei voi poistaa corba-virheen takia"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "Tehtävää ei voi poistaa corba-virheen takia"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "Muistilappua ei voi poistaa corba-virheen takia"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "Kohdetta ei voi poistaa corba-virheen takia"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "Tapaa_minen"
+
+#~ msgid "Attendee_s"
+#~ msgstr "Osallistujat"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "O_sanottajat..."
+
+#~ msgid "_Task"
+#~ msgstr "_Tehtävä"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "_Osanottajat..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Valitse tämä päivä"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Google-tilin asetukset:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Yahoo-tilin asetukset:</span>"
+
+#~ msgid "Compose New Message"
+#~ msgstr "Luo uusi viesti"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d päivää sitten"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Pidemmmän nimi"
+
+#~ msgid "Filename"
+#~ msgstr "Tiedostonimi"
+
+#~ msgid "The filename of the module"
+#~ msgstr "Moduulin nimi"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Onko lisäosa käytössä"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "PGP-viestiä ei voitu tulkita: tuntematon virhe"
+
+#~ msgid "Shell Module"
+#~ msgstr "Päätemoduli"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "Sähköpostikuoren taustajärjestelmä"
+
+#~ msgid "Show Deleted"
+#~ msgstr "näytä poistetut"
+
+#~ msgid "To Do"
+#~ msgstr "Tehtävää"
+
+#~ msgid "Later"
+#~ msgstr "Myöhemmin"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolutionin sähköpostikansioiden sijainti ja rakenne on muuttunut "
+#~ "versiosta Evolution 1.x.\n"
+#~ "\n"
+#~ "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "Sallii evolutionin näyttää rajoitetun kokoiset tekstiosat"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "Ota käyttöön viestin tekstiosan rajoitettu näyttökoko."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Tekstin viestiosan kokoraja"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Syy: \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Syy: \"{2}\"."
+
+#~ msgid "Do not d_elete"
+#~ msgstr "�_lä poista"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Seuraavat hakunäkymät:\n"
+#~ "{0}\n"
+#~ "käyttivät poistettua kansiota:\n"
+#~ "   \"{1}\"\n"
+#~ "ja ne on päivitetty."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Seuraavat suodatinsäännöt:\n"
+#~ "{0}\n"
+#~ "käyttivät poistettua kansiota:\n"
+#~ "   \"{1}\"\n"
+#~ "ja ne on päivitetty."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Tulkin taustajärjestelmä"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Tässä kansiossa on vain piilotettuja viestejä. Valitse Näytä-valikosta "
+#~ "kohta Näytä piilotetut viestit, jos haluat nähdä ne."
+
+#~ msgid "Table column:"
+#~ msgstr "Taulun sarake:"
+
+#~ msgid "Source List"
+#~ msgstr "Lähdeluettelo"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Luettelo osoitekirjoista"
+
+#~ msgid "Current View"
+#~ msgstr "Nykyinen näkymä"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Esikatseltu yhteystieto"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Yhteystietojen esikatselupaneelissa näytettävä yhteystieto"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "Esikatselu on näkyvissä"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Näytetäänkö esikatselupaneeli"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP-palvelimet"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Automaattisen täydennyksen asetukset"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolutionin yhteystietojen kansioiden sijainti ja rakenne on muuttunut "
+#~ "Evolution 1.x:n jälkeen.\n"
+#~ "\n"
+#~ "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Sähköpostilistojen yhteystietojen muoto on muuttunut.\n"
+#~ "\n"
+#~ "Odota kärsivällisesti, kun Evolution muuntaa kansioitasi..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Muutamien puhelinnumeroiden tallennustapa on muuttunut.\n"
+#~ "\n"
+#~ "Odota kärsivällisesti kun Evolution muuntaa kansioitasi..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolutionin Palm synkronoinnin muutosloki ja karttatiedostot ovat "
+#~ "muuttuneet.\n"
+#~ "\n"
+#~ "Odota kärsivällisesti kun Evolution muuntaa Pilotin "
+#~ "synkronointitietojasi..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Lähteen valintaikkuna"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Tämä elementti näyttä osoitekirjaryhmiä"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Tallenna vCard-muodossa..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolutionin kalenterikansioiden sijainti ja rakenne on muuttunut "
+#~ "versiosta 1.x\n"
+#~ "\n"
+#~ "Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Vanhojen asetusten siirto ei onnistunut tiedostosta evolution/config.xmldb"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Päivämäärävalitsin"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Tämä elementti näyttää pienen kalenterin"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Tämä elementti näyttää kalenteriryhmän"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Rekisteri muistilappuluetteloista"
+
+#~ msgid "The memo table model"
+#~ msgstr "Muistilappujen taulumalli"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Rekisteri tehtävälistoista"
+
+#~ msgid "The task table model"
+#~ msgstr "Tehtävien taulumalli"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolutionin tehtäväkansioiden sijainti ja rakenne on muuttunut versiosta "
+#~ "1.x\n"
+#~ "\n"
+#~ "Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Tämä elementti näyttä ryhmiä tehtävälistaluetteloista"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Piilota _luetut viestit"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Piilota kaikki luetut viestit väliaikaisesti"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Piilota _valitut viestit"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Piilota valitut viestit väliaikaisesti"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Näytä piil_otetut viestit"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Piilota _poistetut viestit"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr ""
+#~ "Piilota poistetut viestit sen sijaan, että ne näytettäisiin yliviivattuina"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
+
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding.  If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "Evolution varmuuskopiointi voidaan käynnistä vain, kun Evolution ei ole "
+#~ "käynnissä. Varmista että olet tallentanut ja sulkenut kaikki ikkunat "
+#~ "ennen jatkamista. Voit asetta evolutionin käynnistymään automaattisesti, "
+#~ "kun varmuuskopiointi on päättynyt."
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "Tämä poistaa kaikki nykyiset Evolutionin tiedot ja asetukset, ja "
+#~ "palauttaa ne varmuuskopiosta. Varmuuskopion palautus voidaan käynnistää "
+#~ "vain, kun Evolution ei ole käynnissä. Varmista että olet tallentanut ja "
+#~ "sulkenut kaikki ikkunat ennen jatkamista. Voit asetta evolutionin "
+#~ "käynnistymään automaattisesti, kun varmuuskopiointi on päättynyt."
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr ""
+#~ "Tarkista käynnistettäessä, onko Evolution sähköpostin oletusohjelma."
+
+#~ msgid "Default Mail Client"
+#~ msgstr "Sähköpostin oletusohjelma"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>Palvelin</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Käyttäjät:</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Tilin nimi</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Lisää Hula-tuki Evolutioniin."
+
+#~ msgid "Hula Support"
+#~ msgstr "Hula-tuki"
+
+#~ msgid "_Accept"
+#~ msgstr "H_yväksy"
+
+#~ msgid "Blink icon in notification area."
+#~ msgstr "Vilkuta kuvaketta ilmoitusalueella."
+
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "Vilkkuuko uudesta sähköpostista ilmoittava kuvake."
+
+#~ msgid "B_link icon in notification area"
+#~ msgstr "_Vilkuta kuvaketta ilmoitusalueella"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "Ohjaa tilin asetusten määrittelyssä ensikäynnistyksellä."
+
+#~ msgid "Setup Assistant"
+#~ msgstr "Asetusapulainen"
+
+#~ msgid "Importing data."
+#~ msgstr "Tuodaan tietoja."
 
-#: ../debian/evolution-mail.desktop.in.h:1
-msgid "Evolution Mail"
-msgstr "Evolution-sähköposti"
+#~ msgid "Please wait"
+#~ msgstr "Odota, ole hyvä"
 
-#: ../debian/evolution-mail.desktop.in.h:2
-msgid "Read and write emails"
-msgstr "Lue ja kirjoita sähköposteja"
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "_Työkalupalkin tyyli"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "Vaihtimen työkalupalkin tyyli"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "Työkalupalkki näkyvissä"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Näytetäänkö valitsin"
+
+#~ msgid "Switcher Action"
+#~ msgstr "Vaihtimen toiminto"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "Tämän kuorinäkymän vaihtimen toiminto"
+
+#~ msgid "Page Number"
+#~ msgstr "Sivunumero"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "Tämän kuorinäkymä välilehden sivunumero"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "Tämän kuorinäkymän EShellBackend"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Kuoren sisältöelementti"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "Sisältöelementti näytetään kuori-ikkunan oikeana paneelina"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Kuoren sivupalkkielementti"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "Sivupalkkielementti näytetään kuori-ikkunan vasempana paneelina"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Kuoren tehtävälistaelementti"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "Tehtävälistaelementti näytetään kuori-ikkunan alaosassa"
+
+#~ msgid "Shell Window"
+#~ msgstr "Kuoren ikkuna"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "Ikkuna, johon kuorinäkymä kuuluu"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "Kuorinäkymän otsikko"
+
+#~ msgid "Current View ID"
+#~ msgstr "Nykyisen näkymän tunniste"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "Nykyisen GAL-näkymän tunniste"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "Gnome-pilotia ei ole asennettu."
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "Gnome-pilotia ei voitu suorittaa."
+
+#~ msgid "Active Shell View"
+#~ msgstr "Aktiivinen tulkkinäkymä"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Aktiivisen tulkkinäkymän nimi"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Turvallinen tila"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Onko tulkki-ikkuna turvallisessa tilassa"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI-hallinta"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "Tulkki-ikkunan GtkUIManager"
+
+#~ msgid "Network Available"
+#~ msgstr "Verkko käytettävissä"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Onko verkko käytettävissä"
+
+#~ msgid "Online"
+#~ msgstr "Verkossa"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Onko tulkki verkossa"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Kuoren asetukset"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "Ohjelmanlaajuiset asetukset"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Tuo tiedot väkisin uudestaan Evolution 1.4:stä"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Levytila ei riitä päivitykseen."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Poistetaanko vanhat tiedot varmasti?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "Hakemisto &quot;evolution&quot; sisältöineen ollaan poistamassa "
+#~ "pysyvästi.\n"
+#~ "\n"
+#~ "On suositeltavaa tarkistaa, että kaikki sähköpostisi, yhteystietosi ja "
+#~ "kalenterimerkintäsi ovat olemassa ja että tämä Evolutionin versio toimii "
+#~ "oikein ennen kuin nämä vanhat tiedot poistetaan.\n"
+#~ "\n"
+#~ "Kun vanhat tiedot on poistettu, et voi vaihtaa helposti takaisin vanhaan "
+#~ "versioon ja saada tietojasi näkyviin ilman käsityötä.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Evolutionin edellinen versio tallensi tiedot eri paikkaan.\n"
+#~ "\n"
+#~ "Jos päätät poistaa nämä tiedot, poistetaan hakemisto &quot;"
+#~ "evolution&quot; sisältöineen pysyvästi. Jos päätät pitää nämä tiedot, "
+#~ "voit itse poistaa hakemiston &quot;evolution&quot; myöhemmin.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Tietojesi ja asetuksiesi päivittäminen voi vaatia {0} levytilaa, mutta "
+#~ "vain {1} on vapaana.\n"
+#~ "Sinun täytyy vapauttaa enemmän tilaa kotihakemistostasi ennen kuin voit "
+#~ "jatkaa."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Säilytä tiedot"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Muistuta myöhemmin"
+
+#~ msgid "Edit"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Import"
+#~ msgstr "Tuo"
+
+#~ msgid "View"
+#~ msgstr "Näytä"
+
+#~ msgid "Collection"
+#~ msgstr "Kokoelma"
+
+#~ msgid "Instance"
+#~ msgstr "Tapahtumiskerta"
+
+#~ msgid "Factory"
+#~ msgstr "Tehdas"
+
+#~ msgid "Action"
+#~ msgstr "Toiminto"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Näytä _liitepalkki"
+
+#~ msgid "Fill color"
+#~ msgstr "Täytön väri"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK:n täyttöväri"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Täytön kuviopeite"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Minimileveys"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Minimileveys"
+
+#~ msgid "Spacing"
+#~ msgstr "Välistys"
+
+#~ msgid "The button state is online"
+#~ msgstr "Napin tila on verkossa"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Vaakasijainti"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
+
+#~ msgid "Vertical Position"
+#~ msgstr "Pystysijainti"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Paneelin sijainti sen ollessa pystyasennossa"
+
+#~ msgid "Sync with:"
+#~ msgstr "Synkronoi:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "Synkronisoi yksityiset tietueet:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "Synkronointiluokat:"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Kohdistimen rivi"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Kohdistimen sarake"
+
+#~ msgid "Sorter"
+#~ msgstr "Järjestäjä"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Valintatila"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Kohdistintila"
+
+#~ msgid "Selected Column"
+#~ msgstr "Valittu sarake"
+
+#~ msgid "Focused Column"
+#~ msgstr "Kohdistettu sarake"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Valitsematon sarake"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Yliviivattu sarake"
+
+#~ msgid "Underline Column"
+#~ msgstr "Alleviivaa sarake"
+
+#~ msgid "Bold Column"
+#~ msgstr "Vahva sarake"
+
+#~ msgid "Color Column"
+#~ msgstr "Värillinen sarake"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Taustan värinen sarake"
+
+#~ msgid "State"
+#~ msgstr "Tila"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Vaihtelevat rivien värit"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Vaakasuuntainen piirtoristikko"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Pystysuuntainen piirtoristikko"
+
+#~ msgid "Draw focus"
+#~ msgstr "Piirron kohdistin"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Kursorin tila"
+
+#~ msgid "Selection model"
+#~ msgstr "Valintamalli"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Pituuden raja-arvo"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Yhtenäinen rivinkorkeus"
+
+#~ msgid "Frozen"
+#~ msgstr "Jäädytetty"
+
+#~ msgid "Table header"
+#~ msgstr "Taulukon otsikko"
+
+#~ msgid "Table model"
+#~ msgstr "Taulumalli"
+
+#~ msgid "Cursor row"
+#~ msgstr "Kohdistimen rivi"
+
+#~ msgid "Sort Info"
+#~ msgstr "Tietoja järjestyksestä"
+
+#~ msgid "Always search"
+#~ msgstr "Etsi aina"
+
+#~ msgid "Use click to add"
+#~ msgstr "Lisää napsauttamalla"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree-taulukon adapteri"
+
+#~ msgid "Retro Look"
+#~ msgstr "Retro-ulkoasu"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Piirrä viivat ja +/- laajentimet."
+
+#~ msgid "Expander Size"
+#~ msgstr "Laajentimen koko"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Laajennusnuolen koko"
+
+#~ msgid "popup"
+#~ msgstr "ponnahdusikkuna"
+
+#~ msgid "edit"
+#~ msgstr "muokkaa"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "muokkaa tätä solua"
+
+#~ msgid "toggle"
+#~ msgstr "vaihtele"
+
+#~ msgid "expand"
+#~ msgstr "laajenna"
+
+#~ msgid "Event Processor"
+#~ msgstr "Tapahtumaprosessori"
+
+#~ msgid "Text"
+#~ msgstr "Teksti"
+
+#~ msgid "Bold"
+#~ msgstr "Vahva"
+
+#~ msgid "Strikeout"
+#~ msgstr "Yliviivattu"
+
+#~ msgid "Anchor"
+#~ msgstr "Ankkuri"
+
+#~ msgid "Justification"
+#~ msgstr "Asemointi"
+
+#~ msgid "Clip Width"
+#~ msgstr "Leikkeen leveys"
+
+#~ msgid "Clip Height"
+#~ msgstr "Leikkeen korkeus"
+
+#~ msgid "Clip"
+#~ msgstr "Leike"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Täytä leikkauksen suorakulmio"
+
+#~ msgid "X Offset"
+#~ msgstr "X-offset"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y-offset"
+
+#~ msgid "Text width"
+#~ msgstr "Tekstin leveys"
+
+#~ msgid "Text height"
+#~ msgstr "Tekstin korkeus"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Käytä ellipsejä"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Ellipsit"
+
+#~ msgid "Line wrap"
+#~ msgstr "Rivitys"
+
+#~ msgid "Break characters"
+#~ msgstr "Katkaisevat merkit"
+
+#~ msgid "Max lines"
+#~ msgstr "Rivejä enintään"
+
+#~ msgid "Draw borders"
+#~ msgstr "Piirrä reunat"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Salli rivinvaihdot"
+
+#~ msgid "Draw background"
+#~ msgstr "Piirrä tausta"
+
+#~ msgid "Draw button"
+#~ msgstr "Piirrä nappi"
+
+#~ msgid "Cursor position"
+#~ msgstr "Kohdistimen sijainti"
+
+#~ msgid "IM Context"
+#~ msgstr "IM-konteksti"
+
+#~ msgid "Handle Popup"
+#~ msgstr "Kahvan ponnahdusikkuna"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Evolution-sähköposti"
+
+#~ msgid "Read and write emails"
+#~ msgstr "Lue ja kirjoita sähköposteja"
 
 #~ msgid "Save Memo"
 #~ msgstr "Tallenna muistilappu"
@@ -22627,7 +22822,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Save Appointment"
 #~ msgstr "Tallenna tapaaminen"
 
-#, c-format
 #~ msgid "SpamAssassin is not available."
 #~ msgstr "Spamassassin ei ole saatavilla."
 
@@ -22645,7 +22839,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Subject or Recipients contains"
 #~ msgstr "Aihe tai vastaanottaja sisältää"
 
-#, c-format
 #~ msgid "Retrieving quota information for folder %s"
 #~ msgstr "Noudetaan kansion %s levytilatietoja"
 
@@ -22662,8 +22855,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Määrittele verkkoyhteysasetukset tästä"
 
 #~ msgid ""
-#~ "A label having the same tag already exists on the server. Please rename your "
-#~ "label."
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
 #~ msgstr ""
 #~ "Samanniminen merkintä on jo tallennettu palvelimelle. Nimeä merkintä "
 #~ "uudestaan."
@@ -22724,7 +22917,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "_Mailbox:"
 #~ msgstr "_Sähköpostikansio:"
 
-#, c-format
 #~ msgid "untitled_image.%s"
 #~ msgstr "nimetön_kuva.%s"
 
@@ -22734,7 +22926,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "<b>_Selection</b>"
 #~ msgstr "<b>_Valinta/</b>"
 
-#, c-format
 #~ msgid "Shutting down %s (%s)\n"
 #~ msgstr "Sammutetaan %s (%s)\n"
 
@@ -22822,7 +23013,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "_Searches"
 #~ msgstr "_Haut"
 
-#, c-format
 #~ msgid "Unknown character set: %s"
 #~ msgstr "Tuntematon merkistö: %s"
 
@@ -22835,9 +23025,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "_Synchronization Options..."
 #~ msgstr "_Synkronointiasetukset..."
 
-#~ msgid "_Quit"
-#~ msgstr "_Lopeta"
-
 #~ msgid "_Hide Buttons"
 #~ msgstr "_Piilota napit"
 
@@ -23031,7 +23218,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Copy"
 #~ msgstr "Kopioi"
 
-#, c-format
 #~ msgid "Could not execute '%s': %s\n"
 #~ msgstr "Komentoa %s ei voitu suorittaa: %s\n"
 
@@ -23163,7 +23349,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "<span weight=\"bold\">Location</span>"
 #~ msgstr "<span weight=\"bold\">Sijainti</span>"
 
-#, c-format
 #~ msgid "Enter the password for `%s'"
 #~ msgstr "Syötä salasana '%s':lle"
 
@@ -23210,15 +23395,12 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "The \"hald\" service is required but not currently running. Please enable "
 #~ "the service and rerun this program, or contact your system administrator."
 #~ msgstr ""
-#~ "Palvelu \"hald\" vaaditaan, mutta se ei ole päällä. Ota palvelu käyttöön ja "
-#~ "aja ohjelma uudestaan, tai ota yhteyttä ylläpitäjääsi."
+#~ "Palvelu \"hald\" vaaditaan, mutta se ei ole päällä. Ota palvelu käyttöön "
+#~ "ja aja ohjelma uudestaan, tai ota yhteyttä ylläpitäjääsi."
 
 #~ msgid "Hardware Abstraction Layer not loaded"
 #~ msgstr "Laitteistorajapinta HAL ei ole ladattu"
 
-#~ msgid "_Import"
-#~ msgstr "_Tuo"
-
 #~ msgid "<b>IMAP Headers</b>"
 #~ msgstr "<b>IMAP-otsakkeet</b>"
 
@@ -23262,8 +23444,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Salasanasi on vanhentunut."
 
 #~ msgid ""
-#~ "Your current usage is: {0} KB. You will not be able to send mail until you "
-#~ "clear up some space by deleting some mail."
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
 #~ msgstr ""
 #~ "Käytät tällä hetkellä {0} kt. Et voi lähettää sähköpostia ennen kuin olet "
 #~ "vapauttanut tilaa poistamalla joitain tallennettuja viestejä."
@@ -23272,11 +23454,12 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "Your current usage is: {0} KB. You will not be able to either send or "
 #~ "receive mail now."
 #~ msgstr ""
-#~ "Käytät tällä hetkellä {0} kt. Et voi lähettää tai vastaanottaa sähköpostia."
+#~ "Käytät tällä hetkellä {0} kt. Et voi lähettää tai vastaanottaa "
+#~ "sähköpostia."
 
 #~ msgid ""
-#~ "Your current usage is: {0} KB. Try to clear up some space by deleting some "
-#~ "mail."
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
 #~ msgstr ""
 #~ "Käytät tällä hetkellä {0} kt. Yritä vapauttaa tilaa poistamalla joitain "
 #~ "viestejä."
@@ -23294,10 +23477,11 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "You are permitted to send a message on behalf of only one delegator at a "
 #~ "time."
 #~ msgstr ""
-#~ "Sinulla on lupa lähettää viestejä toisten puolesta vain yhden valtuuttajan "
-#~ "nimissä kerrallaan."
+#~ "Sinulla on lupa lähettää viestejä toisten puolesta vain yhden "
+#~ "valtuuttajan nimissä kerrallaan."
 
-#~ msgid "You are nearing your quota available for storing mail on this server."
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
 #~ msgstr ""
 #~ "Sähköpostisi tallennukseen varattu tila tällä palvelimella alkaa loppua."
 
@@ -23338,9 +23522,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Server rejected password because it is too weak."
 #~ msgstr "Palvelin hylkäsi salasanan, koska se on liian yksinkertainen."
 
-#~ msgid "Please select a user."
-#~ msgstr "Valitse käyttäjä."
-
 #~ msgid "Please restart Evolution for changes to take effect"
 #~ msgstr "Käynnistä Evolution uudestaan, jotta muutokset tulevat voimaan"
 
@@ -23378,8 +23559,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Sähköpostit käyttäjälle {0} eivät ole tällä palvelimella."
 
 #~ msgid ""
-#~ "If OWA is running on a different path, you must specify that in the account "
-#~ "configuration dialog."
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
 #~ msgstr ""
 #~ "Jos OWA on käytössä eri polussa täytyy se määritellä erikseen tilin "
 #~ "asetuksissa."
@@ -23480,8 +23661,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Palvelimelle tunnistautuminen epäonnistui."
 
 #~ msgid ""
-#~ "Changes to options for Exchange account \"{0}\" will only take effect after "
-#~ "restarting Evolution."
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
 #~ msgstr ""
 #~ "Muutokset Exchange-tilin \"{0}\" asetuksiin tulevat voimaan, kun olet "
 #~ "sulkenut ja käynnistynyt Evolutionin uudestaan."
@@ -23630,8 +23811,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Olen tällä hetkellä konttorilla"
 
 #~ msgid ""
-#~ "<small>The message specified below will be automatically sent to each person "
-#~ "who sends\n"
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
 #~ "mail to you while you are out of the office.</small>"
 #~ msgstr ""
 #~ "<small>Alla määritelty viesti lähetetään automaattisesti jokaiselle "
@@ -23653,11 +23834,9 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "\n"
 #~ "Haluatko muuttaa tilasi tilaan \"Konttorilla\"? "
 
-#, c-format
 #~ msgid "Unsubscribe from \"%s\""
 #~ msgstr "Peru \"%s\" tilaus"
 
-#, c-format
 #~ msgid "Really unsubscribe from folder \"%s\"?"
 #~ msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
@@ -23707,18 +23886,15 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Error reading delegates list."
 #~ msgstr "Virhe luettaessa listaa valtuutetuista."
 
-#, c-format
 #~ msgid "Could not add delegate %s"
 #~ msgstr "Valtuutettua %s ei voi lisätä"
 
 #~ msgid "Could not update list of delegates."
 #~ msgstr "Valtuutettujen listaa ei voi päivittää."
 
-#, c-format
 #~ msgid "Could not remove delegate %s"
 #~ msgstr "Valtuutettua %s ei voi poista"
 
-#, c-format
 #~ msgid "Could not find delegate %s in Active Directory"
 #~ msgstr "Valtuutettua %s ei löytynyt Active Directorystä"
 
@@ -23728,14 +23904,12 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Could not access Active Directory"
 #~ msgstr "Active Directorya ei voi avata"
 
-#, c-format
 #~ msgid "Remove the delegate %s?"
 #~ msgstr "Poistetaanko valtuutus %s?"
 
 #~ msgid "Delegate To"
 #~ msgstr "Valtuuta henkilö"
 
-#, c-format
 #~ msgid "You have been designated as a delegate for %s"
 #~ msgstr "Sinut on nimetty käyttäjän %s valtuutetuksi"
 
@@ -23749,13 +23923,13 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Sinulle on annettu seuraavat oikeudet kansioihini:"
 
 #~ msgid ""
-#~ "This message was sent automatically by Evolution to inform you that you have "
-#~ "been designated as a delegate. You can now send messages on my behalf."
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
 #~ msgstr ""
-#~ "Evolution lähetti tämän viestin automaattisesti kertoakseen, että sinut on "
-#~ "merkitty valtuutetuksi. Voit nyt lähettää viestejä puolestani."
+#~ "Evolution lähetti tämän viestin automaattisesti kertoakseen, että sinut "
+#~ "on merkitty valtuutetuksi. Voit nyt lähettää viestejä puolestani."
 
-#, c-format
 #~ msgid "Permissions for %s"
 #~ msgstr "Oikeudet käyttäjälle %s"
 
@@ -23774,7 +23948,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Custom"
 #~ msgstr "Oma näkymä"
 
-#, c-format
 #~ msgid "Your password will expire in the next %d days"
 #~ msgstr "Salasanasi vanhenee seuraavan %d päivän kuluessa"
 
@@ -23794,17 +23967,15 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Salasanat eivät ole samat. Syötä salasanat uudestaan."
 
 #~ msgid ""
-#~ "The current password does not match the existing password for your account. "
-#~ "Please enter the correct password"
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
 #~ msgstr ""
 #~ "Nykyinen salasana ei vastaa tilisi olemassaolevaa salasanaa. Syötä oikea "
 #~ "salasana."
 
-#, c-format
 #~ msgid "0 KB"
 #~ msgstr "0 kt"
 
-#, c-format
 #~ msgid "%s KB"
 #~ msgstr "%s kt"
 
@@ -23864,9 +24035,10 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Selväkielinen salasana"
 
 #~ msgid ""
-#~ "This option will connect to the Exchange server using secure password (NTLM) "
-#~ "authentication."
-#~ msgstr "Yhdistä Exchange-palvelimelle käyttäen turvallista salasanaa (NTLM)."
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "Yhdistä Exchange-palvelimelle käyttäen turvallista salasanaa (NTLM)."
 
 #~ msgid "Secure Password"
 #~ msgstr "Turvallinen salasana"
@@ -23895,23 +24067,18 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Delete account?"
 #~ msgstr "Poista tili?"
 
-#, c-format
 #~ msgid "Invalid folder: `%s'"
 #~ msgstr "Virheellinen kansio: ' %s'"
 
-#, c-format
 #~ msgid "Trying to movemail a non-mbox source `%s'"
 #~ msgstr "Yritettiin 'movemail':ia lähteelle '%s', joka ei ole tyyppiä mbox"
 
-#, c-format
 #~ msgid "Could not create spool directory `%s': %s"
 #~ msgstr "Saapuvien kansiota '%s' ei voi luoda: %s"
 
-#, c-format
 #~ msgid "Reconnecting to %s"
 #~ msgstr "Otetaan uudestaan yhteyttä kohteeseen %s"
 
-#, c-format
 #~ msgid "Disconnecting from %s"
 #~ msgstr "Yhteyttä %s katkaistaan"
 
@@ -23921,34 +24088,27 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Refreshing folder"
 #~ msgstr "Virkistetään kansiota"
 
-#, c-format
 #~ msgid "Removing folder %s"
 #~ msgstr "Poistetaan kansiota %s"
 
-#, c-format
 #~ msgid "Opening store %s"
 #~ msgstr "Avataan tallennustilaa %s"
 
-#, c-format
 #~ msgid "Opening folder %s"
 #~ msgstr "Avataan kansiota %s"
 
-#, c-format
 #~ msgid "Copying messages to %s"
 #~ msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#, c-format
 #~ msgid "Moving messages to %s"
 #~ msgstr "Siirretään viestejä kohteeseen %s"
 
 #~ msgid "Saving message to folder"
 #~ msgstr "Tallennetaan viestiä kansioon"
 
-#, c-format
 #~ msgid "Failed to append to local `Sent' folder: %s"
 #~ msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#, c-format
 #~ msgid ""
 #~ "Failed to append to %s: %s\n"
 #~ "Appending to local `Sent' folder instead."
@@ -24058,7 +24218,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "New Mail Message"
 #~ msgstr "Uusi viesti"
 
-#, c-format
 #~ msgid "Importing `%s'"
 #~ msgstr "Tuodaan '%s'"
 
@@ -24078,13 +24237,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "Viesti-ikkunan oletuskorkeus"
 
 #~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is required "
-#~ "before going into offline mode."
-#~ msgstr ""
-#~ "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
-#~ "synkronointia yhteydettömään tilaan siirryttäessä."
-
-#~ msgid ""
 #~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
 #~ "vertically."
 #~ msgstr ""
@@ -24094,35 +24246,27 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "_Reply to sender"
 #~ msgstr "_Vastaa lähettäjälle"
 
-#, c-format
 #~ msgid "Unable to create local mail folders at `%s': %s"
 #~ msgstr "Paikallisia sähköpostikansioita ei voi luoda paikkaan '%s': %s"
 
-#, c-format
 #~ msgid "Failed to create local mail storage `%s': %s"
 #~ msgstr "Paikallista sähköpostitilaa '%s' ei voi luoda: %s"
 
-#, c-format
 #~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 #~ msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
 
-#, c-format
 #~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 #~ msgstr "POP3 keep-on-server tietojen hakemistoa '%s' ei voi luoda: %s"
 
-#, c-format
 #~ msgid "Unable to open old POP keep-on-server data `%s': %s"
 #~ msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voi avata: %s"
 
-#, c-format
 #~ msgid "Unable to scan for existing mailboxes at `%s': %s"
 #~ msgstr "Sähköpostin läpikäynti kohteesta '%s' epäonnistui: %s"
 
-#, c-format
 #~ msgid "Unable to copy folder `%s' to `%s': %s"
 #~ msgstr "Kansiota %s ei voi kopioidaan kohtaan %s: %s"
 
-#, c-format
 #~ msgid "Unable to create new folder `%s': %s"
 #~ msgstr "Kansiota '%s' ei voi luoda: %s"
 
@@ -24150,7 +24294,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "U_ndelete"
 #~ msgstr "_Palauta"
 
-#, c-format
 #~ msgid "Creating folder `%s'"
 #~ msgstr "Luodaan kansiota %s"
 
@@ -24192,7 +24335,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 
 #~ msgid "Configure spell-checking, signatures, and the message composer here"
 #~ msgstr ""
-#~ "Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tästä"
+#~ "Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset "
+#~ "tästä"
 
 #~ msgid ""
 #~ "Configure mail preferences, including security and message display, here"
@@ -24227,9 +24371,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "address card"
 #~ msgstr "osoitekortti"
 
-#~ msgid "You cannot attach the file `{0}' to this message."
-#~ msgstr "Et voi lisätä tiedostoa '{0}' tähän viestiin."
-
 #~ msgid "Warning: Modified Message"
 #~ msgstr "Varoitus: Muutettu viesti"
 
@@ -24238,14 +24379,17 @@ msgstr "Lue ja kirjoita sähköposteja"
 
 #~ msgid ""
 #~ "To attach the contents of this directory, either attach the files in this "
-#~ "directory individually, or create an archive of the directory and attach it."
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
 #~ msgstr ""
 #~ "Jos haluat lisätä hakemiston sisällön, liitä joko jokainen tiedosto "
 #~ "hakemistossa erikseen tai luo arkisto hakemistosta ja liitä arkisto."
 
-#~ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#~ msgid ""
+#~ "The file `{0}' is not a regular file and cannot be sent in a message."
 #~ msgstr ""
-#~ "Tiedosto `{0}' ei ole tavallinen tiedosto eikä sitä voi lähettää viestissä."
+#~ "Tiedosto `{0}' ei ole tavallinen tiedosto eikä sitä voi lähettää "
+#~ "viestissä."
 
 #~ msgid "Send options not available."
 #~ msgstr "Lähetysasetukset eivät ole saatavilla."
@@ -24268,7 +24412,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "There is no calendar available for creating tasks"
 #~ msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#, c-format
 #~ msgid "Unable to open the task list '%s' for creating events and meetings"
 #~ msgstr ""
 #~ "Tehtävälistaa '%s' ei voi avata uusien tehtävien ja tapaamisten tekemistä "
@@ -24277,11 +24420,9 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Failed upgrading tasks."
 #~ msgstr "Tehtävälistan päivitys epäonnistui."
 
-#, c-format
 #~ msgid "Unable to migrate tasks `%s'"
 #~ msgstr "Tehtävien '%s' muunnos epäonnistui"
 
-#, c-format
 #~ msgid "Unable to migrate calendar `%s'"
 #~ msgstr "Kalenterin '%s' muunnos epäonnistui"
 
@@ -24291,7 +24432,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "There is no calendar available for creating memos"
 #~ msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#, c-format
 #~ msgid "Unable to open the memo list '%s' for creating events and meetings"
 #~ msgstr ""
 #~ "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
@@ -24300,15 +24440,12 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Failed upgrading memos."
 #~ msgstr "Muistilappujen päivitys epäonnistui."
 
-#, c-format
 #~ msgid "Loading memos at %s"
 #~ msgstr "Ladataan muistilappuja lähteestä %s"
 
-#, c-format
 #~ msgid "Loading tasks at %s"
 #~ msgstr "Ladataan tehtäviä %s"
 
-#, c-format
 #~ msgid "Loading appointments at %s"
 #~ msgstr "Ladataan tapaamisia %s"
 
@@ -24425,11 +24562,12 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "<span weight=\"bold\">Alerts</span>"
 #~ msgstr "<span weight=\"bold\">Hälytykset</span>"
 
-#, no-c-format
 #~ msgid ""
-#~ "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#~ "<i>%u and %d will be replaced by user and domain from the email address.</"
+#~ "i>"
 #~ msgstr ""
-#~ "<i>%u ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</i>"
+#~ "<i>%u ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</"
+#~ "i>"
 
 #~ msgid ""
 #~ "60 minutes\n"
@@ -24480,7 +24618,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "There is no calendar available for creating events and meetings"
 #~ msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#, c-format
 #~ msgid "Unable to open the calendar '%s' for creating events and meetings"
 #~ msgstr ""
 #~ "Kalenterin \"%s\" avaus tehtävien ja kokousten luontia varten epäonnistui"
@@ -24520,7 +24657,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "Could not create the alarm notify service factory, maybe it's already "
 #~ "running..."
 #~ msgstr ""
-#~ "Hälytysten huomautuspalvelun tehdasta ei voi luoda, ehkä se oli jo käynnissä?"
+#~ "Hälytysten huomautuspalvelun tehdasta ei voi luoda, ehkä se oli jo "
+#~ "käynnissä?"
 
 #~ msgid "Could not initialize Bonobo"
 #~ msgstr "Bonobon alustus ei onnistunut"
@@ -24569,7 +24707,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Overwrite"
 #~ msgstr "Kirjoita yli"
 
-#, c-format
 #~ msgid ""
 #~ "%s already exists\n"
 #~ "Do you want to overwrite it?"
@@ -24629,16 +24766,16 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "<b>Sähköpostiosoite</b>"
 
 #~ msgid ""
-#~ "This is the name for this server that will appear in your Evolution folder "
-#~ "list. It is for display purposes only. "
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
 #~ msgstr ""
 #~ "Tämä on nimi, jolla tämä palvelin näkyy Evolutionin kansiolistoissa. Sitä "
 #~ "käytetään ainoastaan listoilla näyttämiseen. "
 
 #~ msgid ""
 #~ "The search base is the distinguished name (DN) of the entry where your "
-#~ "searches will begin. If you leave this blank, the search will begin at the "
-#~ "root of the directory tree."
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
 #~ msgstr ""
 #~ "Hakupohja on yksilöllinen nimi (DN) kentälle, josta hakusi alkavat. Jos "
 #~ "jätät tämän tyhjäksi, haku alkaa hakemistopuun juuresta."
@@ -24665,7 +24802,6 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "Rename Folder"
 #~ msgstr "Nimeä kansio uudestaan"
 
-#, c-format
 #~ msgid "Rename the \"%s\" folder to:"
 #~ msgstr "Nimeä \"%s\" uudestaan:"
 
@@ -24727,11 +24863,11 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr "_Kansion nimi:"
 
 #~ msgid ""
-#~ "Unable to read settings from previous Evolution install, "
-#~ "`evolution/config.xmldb' does not exist or is corrupt."
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
 #~ msgstr ""
-#~ "Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, "
-#~ "evolution/config.xmldb' on joko vaurioitunut tai puuttuu."
+#~ "Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
+#~ "config.xmldb' on joko vaurioitunut tai puuttuu."
 
 #~ msgid "_Delete Selected Tasks"
 #~ msgstr "_Poista valitut tehtävät"
@@ -24806,27 +24942,22 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgid "A plugin which loads other plugins written using Python."
 #~ msgstr "Muita pythonilla tehtyjä lisäosia lataava lisäosa."
 
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Evolutionia ei voitu käynnistää"
-
 #~ msgid "<b>Downloading</b>"
 #~ msgstr "<b>Noudetaan</b>"
 
 #~ msgid ""
-#~ "This is the maximum number of entries to download. Setting this number to be "
-#~ "too large will slow down your address book."
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
 #~ msgstr ""
-#~ "Suurin sallittu noudettavien korttien määrä noutokertaa kohti. Tämän arvon "
-#~ "asettaminen liian suureksi hidastaa osoitekirjan käyttöä."
+#~ "Suurin sallittu noudettavien korttien määrä noutokertaa kohti. Tämän "
+#~ "arvon asettaminen liian suureksi hidastaa osoitekirjan käyttöä."
 
 #~ msgid "_Unread Search Folder"
 #~ msgstr "_Lukemattomien hakukansio"
 
-#, c-format
 #~ msgid "Retrieving `%s'"
 #~ msgstr "Noudetaan \"%s\""
 
-#, c-format
 #~ msgid "Retrieving message %s"
 #~ msgstr "Noudetaan viestiä %s"
 
@@ -24853,10 +24984,11 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "Alipuu"
 
 #~ msgid ""
-#~ "This is the full name of your LDAP server. For example, "
-#~ "\"ldap.mycompany.com\"."
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
 #~ msgstr ""
-#~ "Tämä kenttä on LDAP-palvelimen koko nimi, esimerkiksi \"ldap.mycompany.com\"."
+#~ "Tämä kenttä on LDAP-palvelimen koko nimi, esimerkiksi \"ldap.mycompany.com"
+#~ "\"."
 
 #~ msgid "<b>Notes</b>"
 #~ msgstr "<b>Muistilaput</b>"
@@ -25086,7 +25218,8 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
 #~ "Please switch to online mode for such operations."
 #~ msgstr ""
-#~ "Evolution on yhteydettömässä tilassa. Et voi luoda tai muokata kansioita.\n"
+#~ "Evolution on yhteydettömässä tilassa. Et voi luoda tai muokata "
+#~ "kansioita.\n"
 #~ "Avaa verkkoyhteydet, jotta voit suorittaa näitä toimintoja."
 
 #~ msgid ""
@@ -25110,9 +25243,9 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ msgstr ""
 #~ "Liitä pieni kuva kasviostasi lähteviin viesteihin.\n"
 #~ "\n"
-#~ "Käyttäjien täytyy ensin määritellä 48x48-pisteen png-kuva. Kuva tallennetaan "
-#~ "base64-muodossa ja tallennetaan tiedostoon ~/.evolution/faces. Tätä kuvaa "
-#~ "käytetään jatkossa lähetettävissä viesteissä."
+#~ "Käyttäjien täytyy ensin määritellä 48x48-pisteen png-kuva. Kuva "
+#~ "tallennetaan base64-muodossa ja tallennetaan tiedostoon ~/.evolution/"
+#~ "faces. Tätä kuvaa käytetään jatkossa lähetettävissä viesteissä."
 
 #~ msgid "Synchronize your data with your Apple iPod."
 #~ msgstr "_Synkronoi tietosi Apple iPodiin."
@@ -25145,7 +25278,7 @@ msgstr "Lue ja kirjoita sähköposteja"
 #~ "months"
 #~ msgstr ""
 #~ "päivää\n"
-#~ "iikkoa\n"
+#~ "\viikkoa\n"
 #~ "kuukautta"
 
 #~ msgid "The source action to proxy"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]