[evolution] Finnish translation update



commit d473e0a333b0a965dafb0fcde325e3f600f28e3c
Author: Timo Jyrinki <timo debian org>
Date:   Wed Sep 11 09:42:40 2013 +0300

    Finnish translation update

 po/fi.po |12068 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 6195 insertions(+), 5873 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 3ce2940..9345b40 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,20 +9,20 @@
 # yksinkertaisesti sähköpostiohjelma. Saa ehdottaa nimeä.
 #
 # Gnome 2012-03 Finnish translation sprint participants:
-# Jiri Grönroos
 # Niklas Laxström
-#: ../shell/main.c:568
 # Ville-Pekka Vainio <vpivaini cs helsinki fi>, 2010.
-# Jiri Grönroos <jiri gronroos iki fi>, 2012.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013.
+#
+#: ../shell/main.c:557
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-09-17 12:14+0000\n"
-"PO-Revision-Date: 2012-09-23 23:32+0300\n"
-"Last-Translator: Jiri Grönroos <jiri gronroos iki fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"POT-Creation-Date: 2013-09-07 23:08+0000\n"
+"PO-Revision-Date: 2013-09-08 12:00+0300\n"
+"Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
+"Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
 "X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -82,7 +82,7 @@ msgstr "Skeematietoja ei voi hakea LDAP-palvelimelta."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP palvelin ei vastannut kelvollisella skeematiedolla."
+msgstr "LDAP-palvelin ei vastannut kelvollisella skeematiedolla."
 
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
@@ -102,7 +102,6 @@ msgid "Do _Not Delete"
 msgstr "_Älä poista"
 
 #: ../addressbook/addressbook.error.xml.h:14
-#| msgid "Delete address book '{0}'?"
 msgid "Delete remote address book &quot;{0}&quot;?"
 msgstr "Poistetaanko etäosoitekirja &quot;{0}&quot;?"
 
@@ -111,12 +110,11 @@ msgid ""
 "This will permanently remove the address book &quot;{0}&quot; from the "
 "server. Are you sure you want to proceed?"
 msgstr ""
-"Osoitekirja &quot;{0}&quot; poistetaan palvelimelta "
-"pysyvästi. Haluatko jatkaa?"
+"Osoitekirja &quot;{0}&quot; poistetaan palvelimelta pysyvästi. Haluatko "
+"jatkaa?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:68
-#| msgid "Delegated From"
+#: ../calendar/calendar.error.xml.h:61
 msgid "_Delete From Server"
 msgstr "_Poista palvelimelta"
 
@@ -186,22 +184,10 @@ msgid "Error saving {0} to {1}: {2}"
 msgstr "Virhe tallennettaessa {0} kohteeseen {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
-
-#. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:33
-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:34
 msgid "Address '{0}' already exists."
 msgstr "Osoite \"{0}\" on jo olemassa."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -209,16 +195,16 @@ msgstr ""
 "Tälle osoitteelle on jo yhteystieto. Haluatko lisätä uuden yhteystiedon "
 "samalla osoitteella?"
 
-#: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Some addresses already exist in this contact list."
-msgstr ""
+msgstr "Jotkin osoitteet ovat jo olemassa tässä yhteystietoluettelossa."
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
@@ -227,44 +213,42 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Skip duplicates"
 msgstr "Ohita kaksoiskappaleet"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Add with duplicates"
 msgstr "Lisää kaksoiskappaleineen"
 
-#: ../addressbook/addressbook.error.xml.h:41
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "List '{0}' is already in this contact list."
-msgstr "{0} on jo listalla"
+msgstr "Luettelo '{0}' on jo tässä yhteystietoluettelossa."
 
-#: ../addressbook/addressbook.error.xml.h:42
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:39
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr ""
-"Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa. Haluatko "
-"lisätä joka tapauksessa?"
+"Yhteystieto nimellä '{0}' on jo tässä yhteystietoluettelossa. Haluatko "
+"lisätä sen silti?"
 
-#: ../addressbook/addressbook.error.xml.h:43
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:41
 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:45
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "Cannot add new contact"
 msgstr "Uutta yhteystietoa ei voi lisätä"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:44
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -273,9 +257,9 @@ msgstr ""
 "yhteystietonäkymän sivupalkista toinen osoitekirja."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -299,7 +283,7 @@ msgstr "_Missä:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
 
@@ -312,11 +296,11 @@ msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sähköpostit _HTML-muodossa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
+#: ../addressbook/gui/merging/eab-contact-merging.c:409
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
+#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -329,7 +313,7 @@ msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/importers/evolution-vcard-importer.c:1003
 msgid "Contact"
 msgstr "Yhteystieto"
 
@@ -338,9 +322,9 @@ msgid "_Home Page:"
 msgstr "K_otisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:722
+#: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1858
+#: ../modules/itip-formatter/itip-view.c:1877
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -357,7 +341,7 @@ msgid "Home Page:"
 msgstr "Kotisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:98
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
@@ -391,7 +375,8 @@ msgid "_Profession:"
 msgstr "_Ammatti:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#| msgid "_Title:"
+msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titteli:"
 
@@ -432,8 +417,8 @@ msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
-#: ../calendar/gui/e-calendar-view.c:2150
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2278
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
@@ -443,13 +428,12 @@ msgstr "Vuosipäivä"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:131
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
@@ -482,27 +466,27 @@ msgid "_Address:"
 msgstr "_Osoite:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:399
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "Koti"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/e-contact-map.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "Työ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
-#: ../calendar/gui/e-cal-model.c:3570
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3963
 msgid "Other"
 msgstr "Muut"
 
@@ -514,79 +498,79 @@ msgstr "Postitusosoite"
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -594,48 +578,48 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' ei voi olla tuleva päivä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3849
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
@@ -692,6 +676,12 @@ msgstr "Koko nimi"
 msgid "_First:"
 msgstr "_Etunimi:"
 
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#| msgid "_Title:"
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "_Titteli:"
+
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
@@ -705,7 +695,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:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
@@ -727,13 +717,12 @@ msgstr "_Piilota osoitteet lähetettäessä sähköpostia tälle listalle"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "Add an email to the List"
-msgstr ""
+msgstr "Lisää sähköpostiosoite luetteloon"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Remove an email address from the List"
-msgstr "Kopioi sähköpostiosoite leikepöydälle"
+msgstr "Poista sähköpostiosoite luettelosta"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Insert email addresses from Address Book"
@@ -743,23 +732,23 @@ msgstr "Lisää sähköpostiosoitteita osoitekirjasta"
 msgid "_Select..."
 msgstr "_Valitse..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
@@ -786,7 +775,7 @@ msgid "Changed Contact:"
 msgstr "Muutettu yhteystieto:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/merging/eab-contact-merging.c:364
 msgid "_Merge"
 msgstr "_Yhdistä"
 
@@ -806,364 +795,107 @@ msgstr "Alkuperäinen yhteystieto:"
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:346
 msgid "Merge Contact"
 msgstr "Yhdistä yhteystieto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1154
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
-#: ../addressbook/gui/widgets/ea-minicard-view.c:189
-msgid "evolution address book"
-msgstr "evolutionin osoitekirja"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:162
-msgid "Copy _Email Address"
-msgstr "Kopioi _sähköpostiosoite"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
-msgid "Copy the email address to the clipboard"
-msgstr "Kopioi sähköpostiosoite leikepöydälle"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
-msgid "_Send New Message To..."
-msgstr "Lähetä uusi _viesti..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
-msgid "Send a mail message to this address"
-msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
-#, c-format
-msgid "Click to mail %s"
-msgstr "Napsauta lähettääksesi %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
-#, fuzzy
-msgid "Open map"
-msgstr "Avaa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
-#, fuzzy
-msgid "List Members:"
-msgstr "Listan jäsenet"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Nickname"
-msgstr "Kutsumanimi"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Company"
-msgstr "Yritys"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
-msgid "Department"
-msgstr "Osasto"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
-msgid "Profession"
-msgstr "Ammatti"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
-msgid "Position"
-msgstr "Asema"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Manager"
-msgstr "Johtaja"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Assistant"
-msgstr "Apulainen"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-msgid "Video Chat"
-msgstr "Videokeskustelu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:548
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#: ../widgets/misc/e-send-options.c:546
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Vapaa/Varattu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-msgid "Phone"
-msgstr "Puhelin"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
-msgid "Address"
-msgstr "Osoite"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
-msgid "Home Page"
-msgstr "Kotisivu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
-msgid "Web Log"
-msgstr "Web-loki"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Spouse"
-msgstr "Puoliso"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
-msgid "Personal"
-msgstr "Henkilökohtainen"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Note"
-msgstr "Huomautus"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
-msgid "List Members"
-msgstr "Listan jäsenet"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
-msgid "Job Title"
-msgstr "Tehtävänimike"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
-msgid "Home page"
-msgstr "Kotisivu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
-msgid "Blog"
-msgstr "Blogi"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-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 "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Tätä osoitekirjaa ei voitu avata. Joko tämä osoitekirja ei ole merkitty "
-"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:143
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-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:156
-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."
-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:165
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
-"palvelinta ei voi tavoittaa."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "Detailed error message:"
-msgstr "Yksityiskohtainen virheviesti:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Useampi kortti vastasi tätä kyselyä kuin joko palvelin on\n"
-"määritelty palauttamaan tai Evolution näyttämään.\n"
-"Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
-"osoitekirjan hakemistopalvelimen asetuksissa."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-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"
-"more specific or raise the time limit in the directory server\n"
-"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\n"
-"osoitekirjan hakemistopalvelimen asetuksissa."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:225
-#, 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"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:230
-#, 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ä. "
-"%s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
-#, 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:264
-msgid "card.vcf"
-msgstr "kortti.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
-msgid "Select Address Book"
-msgstr "Valitse osoitekirja"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "list"
-msgstr "lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
-msgid "Move contact to"
-msgstr "Siirrä yhteystieto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
-msgid "Copy contact to"
-msgstr "Kopioi yhteystieto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
-msgid "Move contacts to"
-msgstr "Siirrä yhteystiedot"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
-msgid "Copy contacts to"
-msgstr "Kopioi yhteystiedot"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:164
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:168
+#: ../addressbook/gui/widgets/e-addressbook-model.c:167
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:371
+#: ../addressbook/gui/widgets/e-addressbook-model.c:373
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanäkymää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:805
+#: ../addressbook/gui/widgets/e-addressbook-model.c:820
 msgid "Search Interrupted"
 msgstr "Haku keskeytettiin"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:656
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:662
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:668
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 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:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 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:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, 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:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 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:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1178,11 +910,11 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää nämä kaikki yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "_Don't Display"
 msgstr "Ä_lä näytä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -1198,6 +930,11 @@ msgstr "Etunimi"
 msgid "Family Name"
 msgstr "Sukunimi"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+msgid "Nickname"
+msgstr "Kutsumanimi"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Sähköposti 2"
@@ -1250,6 +987,11 @@ msgstr "Faksi kotiin"
 msgid "ISDN Phone"
 msgstr "ISDN-numero"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Muu puhelin"
@@ -1284,6 +1026,11 @@ msgstr "Telex"
 msgid "TTYTDD"
 msgstr "TTYTTD"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+msgid "Company"
+msgstr "Yritys"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Yksikkö"
@@ -1297,11 +1044,21 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:657
+#: ../calendar/gui/e-meeting-list-view.c:666
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+msgid "Manager"
+msgstr "Johtaja"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+msgid "Assistant"
+msgstr "Apulainen"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Kotisivu"
@@ -1314,55 +1071,25 @@ msgstr "Päiväkirja"
 #: ../calendar/gui/dialogs/event-page.ui.h:20
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
 msgid "Categories"
 msgstr "Ryhmät"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "Avaa"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "Yhteystietoluettelo: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "Yhteystiedot: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "Evolutionin minikortti"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "Uusi yhteystieto"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "Uusi yhteystietoluettelo"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:172
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
-msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Work Email"
-msgstr "Työsähköposti"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+msgid "Spouse"
+msgstr "Puoliso"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "Henkilökohtainen sähköposti"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
+msgid "Note"
+msgstr "Huomautus"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:775
-msgid "Other Email"
-msgstr "Muu sähköposti"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:363
+msgid "Contacts Map"
+msgstr "Yhteystietokartta"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1372,7 +1099,7 @@ msgstr ""
 "\n"
 "Etsitään yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1386,7 +1113,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1400,7 +1127,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1410,7 +1137,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1420,148 +1147,388 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "Korttinäkymä"
+#: ../addressbook/gui/widgets/e-minicard.c:93
+msgid "Work Email"
+msgstr "Työsähköposti"
+
+#: ../addressbook/gui/widgets/e-minicard.c:94
+msgid "Home Email"
+msgstr "Henkilökohtainen sähköposti"
+
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:828
+msgid "Other Email"
+msgstr "Muu sähköposti"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+msgid "evolution address book"
+msgstr "evolutionin osoitekirja"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "Uusi yhteystieto"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "Uusi yhteystietoluettelo"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
+msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Avaa"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact List: "
+msgstr "Yhteystietoluettelo: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:161
+msgid "Contact: "
+msgstr "Yhteystiedot: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:188
+msgid "evolution minicard"
+msgstr "Evolutionin minikortti"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
+msgid "Copy _Email Address"
+msgstr "Kopioi _sähköpostiosoite"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "Kopioi sähköpostiosoite leikepöydälle"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "Lähetä uusi _viesti..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:934
+#, c-format
+msgid "Click to mail %s"
+msgstr "Napsauta lähettääksesi %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
+msgid "Open map"
+msgstr "Avaa kartta"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
+msgid "List Members:"
+msgstr "Luettelon jäsenet:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+msgid "Department"
+msgstr "Osasto"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+msgid "Profession"
+msgstr "Ammatti"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+msgid "Position"
+msgstr "Asema"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+msgid "Video Chat"
+msgstr "Videokeskustelu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:591
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Vapaa/Varattu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "Phone"
+msgstr "Puhelin"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+msgid "Address"
+msgstr "Osoite"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+msgid "Home Page"
+msgstr "Kotisivu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+msgid "Web Log"
+msgstr "Web-loki"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+msgid "Personal"
+msgstr "Henkilökohtainen"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
+msgid "List Members"
+msgstr "Listan jäsenet"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
+msgid "Job Title"
+msgstr "Tehtävänimike"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
+msgid "Home page"
+msgstr "Kotisivu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
+msgid "Blog"
+msgstr "Blogi"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
+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 "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Tätä osoitekirjaa ei voitu avata. Joko tämä osoitekirja ei ole merkitty "
+"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:142
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+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:155
+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."
+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:164
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
+"palvelinta ei voi tavoittaa."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
+msgid "Detailed error message:"
+msgstr "Yksityiskohtainen virheviesti:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Useampi kortti vastasi tätä kyselyä kuin joko palvelin on\n"
+"määritelty palauttamaan tai Evolution näyttämään.\n"
+"Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
+"osoitekirjan hakemistopalvelimen asetuksissa."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+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"
+"more specific or raise the time limit in the directory server\n"
+"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\n"
+"osoitekirjan hakemistopalvelimen asetuksissa."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, 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"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, 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ä. "
+"%s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, 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:265
+msgid "card.vcf"
+msgstr "kortti.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Valitse osoitekirja"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "lista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Siirrä yhteystieto"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:544
-#: ../addressbook/importers/evolution-vcard-importer.c:279
-#: ../calendar/importers/icalendar-importer.c:446
-#: ../calendar/importers/icalendar-importer.c:939
-#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Kopioi yhteystieto"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Siirrä yhteystiedot"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Kopioi yhteystiedot"
+
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:281
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1083
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1092
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1102
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1103
+#: ../addressbook/importers/evolution-csv-importer.c:1101
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:805
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:808
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:666
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:668
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 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:717
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "Sivu %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../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:62
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "TULOSTIEDOSTO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Näytä paikalliset osoitekirjakansiot"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../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:69
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|cvs]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:72
-msgid "Export in asynchronous mode"
-msgstr "Vie asynkronisesti"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:75
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-"Yhden tulostiedoston sisältämien korttien lukumäärä käytettäessä "
-"asynkronista tilaa. Oletusarvo on 100."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:77
-msgid "NUMBER"
-msgstr "NUMERO"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:149
+#: ../addressbook/tools/evolution-addressbook-export.c:136
 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:163
+#: ../addressbook/tools/evolution-addressbook-export.c:150
 msgid "Only support csv or vcard format."
 msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:172
-msgid "In async mode, output must be file."
-msgstr "Asynkronisessa tilassa ulostulon täytyy olla tiedosto."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:180
-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:213
+#: ../addressbook/tools/evolution-addressbook-export.c:181
 msgid "Unhandled error"
 msgstr "Käsittelemätön virhe"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "Tiedostoa ei voi avata"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
 #, fuzzy, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
@@ -1570,14 +1537,14 @@ msgstr[1] "tuntia"
 #. 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
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivä"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -1593,17 +1560,16 @@ msgstr "Hylkää _kaikki"
 msgid "_Snooze"
 msgstr "_Torku"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../libevolution-utils/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
 msgid "_Dismiss"
 msgstr "_Hylkää"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1757
-#: ../calendar/alarm-notify/alarm-queue.c:1767
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1472
-#: ../modules/itip-formatter/itip-view.c:1583
+#: ../calendar/alarm-notify/alarm-queue.c:1823
+#: ../calendar/alarm-notify/alarm-queue.c:1833
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -1618,69 +1584,61 @@ msgstr "Torkkumis_aika:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
-#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "päivä"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
-#: ../widgets/misc/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "tuntia"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
-#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1606
-#: ../calendar/alarm-notify/alarm-queue.c:1738
+#: ../calendar/alarm-notify/alarm-queue.c:1665
+#: ../calendar/alarm-notify/alarm-queue.c:1803
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1615
-#: ../calendar/alarm-notify/alarm-queue.c:1617
+#: ../calendar/alarm-notify/alarm-queue.c:1674
+#: ../calendar/alarm-notify/alarm-queue.c:1676
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1625
+#: ../calendar/alarm-notify/alarm-queue.c:1684
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1671
+#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1794
+#: ../calendar/alarm-notify/alarm-queue.c:2135
+#| msgid "Evolution Restore"
+msgid "Evolution Reminders"
+msgstr "Evolution-muistuttajat"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Sinulla on %d muistutus"
 msgstr[1] "Sinulla on %d muistutusta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1867
-#: ../calendar/alarm-notify/alarm-queue.c:1902
+#: ../calendar/alarm-notify/alarm-queue.c:1955
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1871
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution ei vielä tue kalenterin muistutuksia, joissa on\n"
-"sähköpostihuomautus, mutta tämä muistutus oli määritelty\n"
-"lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
-"tavallisen huomautusikkunan."
-
-#: ../calendar/alarm-notify/alarm-queue.c:1908
+#: ../calendar/alarm-notify/alarm-queue.c:1961
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1697,7 +1655,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1923
+#: ../calendar/alarm-notify/alarm-queue.c:1976
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 
@@ -1755,7 +1713,7 @@ msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
@@ -1774,7 +1732,7 @@ msgstr ""
 "tehtävä on peruttu."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Haluatko varmasti poistaa tämän tehtävän?"
@@ -1796,7 +1754,7 @@ msgstr ""
 "muistilappu on poistettu."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/gui/dialogs/delete-comp.c:199
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
@@ -1870,14 +1828,14 @@ 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:30
+msgid "_Save Changes"
+msgstr "_Tallenna muutokset"
+
+#: ../calendar/calendar.error.xml.h:31
 #: ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "_Save Changes"
-msgstr "_Tallenna muutokset"
-
 #: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
@@ -1953,8 +1911,7 @@ 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:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3094
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -1983,109 +1940,86 @@ msgstr ""
 "tehtävälistansa ajan tasalla."
 
 #: ../calendar/calendar.error.xml.h:52
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolutionin tehtäväkomponentti on sulkeutunut odottamatta."
-
-#: ../calendar/calendar.error.xml.h:53
-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:54
-msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Evolutionin kalenteri sulkeutui odottamatta."
-
-#: ../calendar/calendar.error.xml.h:55
-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:56
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Evolutionin muistilappuosa sulkeutui odottamatta."
-
-#: ../calendar/calendar.error.xml.h:57
-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:58
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "Evolutionin kalenteri sulkeutui odottamatta."
-
-#: ../calendar/calendar.error.xml.h:59
 msgid "Editor could not be loaded."
 msgstr "Muokkainta ei voi avata."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:53
 msgid "Delete calendar '{0}'?"
 msgstr "Poistetaanko kalenteri \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:54
 msgid "This calendar will be removed permanently."
 msgstr "Tämä kalenteri poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:55
 msgid "Delete task list '{0}'?"
 msgstr "Poistetaanko tehtävälista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:56
 msgid "This task list will be removed permanently."
 msgstr "Tämä tehtävälista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete memo list '{0}'?"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:58
 msgid "This memo list will be removed permanently."
 msgstr "Tämä muistilappulista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:66
-msgid "Delete remote calendar &quot;{0}&quot;?"
-msgstr "Poistetaanko etäkalenteri &quot;{0}&quot;?"
+#: ../calendar/calendar.error.xml.h:59
+#| msgid "Delete calendar '{0}'?"
+msgid "Delete remote calendar '{0}'?"
+msgstr "Poistetaanko etäkalenteri \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:60
+#| msgid ""
+#| "This will permanently remove the calendar &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the calendar &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"Kalenteri &quot;{0}&quot; poistetaan palvelimelta "
-"pysyvästi. Haluatko jatkaa?"
+"Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti "
+"jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:62
 #| msgid "Delete task list '{0}'?"
-msgid "Delete remote task list &quot;{0}&quot;?"
-msgstr "Poistetaanko tehtävälista &quot;{0}&quot;?"
+msgid "Delete remote task list '{0}'?"
+msgstr "Poistetaanko etätehtävälista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:63
+#| msgid ""
+#| "This will permanently remove the task list &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the task list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"Tehtävälista &quot;{0}&quot; poistetaan palvelimelta "
-"pysyvästi. Haluatko jatkaa?"
+"Etätehtävälista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
+"jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:71
-msgid "Delete remote memo list &quot;{0}&quot;?"
-msgstr "Poistetaanko muistiolista &quot;{0}&quot;?"
+#: ../calendar/calendar.error.xml.h:64
+#| msgid "Delete memo list '{0}'?"
+msgid "Delete remote memo list '{0}'?"
+msgstr "Poistetaanko etämuistiolista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:65
+#| msgid ""
+#| "This will permanently remove the memo list &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the memo list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
-"Muistiolista &quot;{0}&quot; poistetaan palvelimelta "
-"pysyvästi. Haluatko jatkaa?"
+"Etämuistiolista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
+"jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:66
 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:74
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2093,11 +2027,11 @@ msgstr ""
 "Merkityksellisen yhteenvedon lisääminen helpottaa ymmärtämään, mistä "
 "tapaamisessa on kyse."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:68
 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:76
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2105,37 +2039,26 @@ msgstr ""
 "Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa ymmärtämään, "
 "mistä tehtävässä on kyse."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:70
 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:78
-msgid "Error loading calendar"
-msgstr "Virhe ladattaessa kalenteria"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:72
+#| msgid "Error loading calendar"
+msgid "Error loading calendar '{0}'"
+msgstr "Virhe ladatessa kalenteria \"{0}\""
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:73
 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:80
-msgid "Cannot create a new event"
-msgstr "Uutta tapahtumaa ei voi luoda"
-
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:82
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
-"joku toinen kalenteri kalenterinäkymän sivupalkista."
-
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:74
 msgid "Cannot save event"
 msgstr "Tapahtumaa ei voi tallentaa"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:85
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2143,89 +2066,143 @@ msgstr ""
 "\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
 "toinen kalenteri, johon tapaamisia voidaan lisätä."
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:77
 msgid "Cannot save task"
 msgstr "Tehtävää ei voi tallentaa"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:88
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:79
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Error loading task list"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:81
+#, fuzzy
+#| msgid "Error loading task list"
+msgid "Error loading task list '{0}'"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:82
 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:91
-msgid "Error loading memo list"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:84
+#, fuzzy
+#| msgid "Error loading memo list"
+msgid "Error loading memo list '{0}'"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
-#: ../calendar/calendar.error.xml.h:92
+#: ../calendar/calendar.error.xml.h:85
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:87
+#, fuzzy
+#| msgid "Failed to load the calendar '%s' (%s)"
+msgid "Failed to copy an event into the calendar '{0}'"
+msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:89
+#, fuzzy
+#| msgid "Unable to find this task in any task list"
+msgid "Failed to copy a task into the task list '{0}'"
+msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:91
+#, fuzzy
+#| msgid "Unable to find this memo in any memo list"
+msgid "Failed to copy a memo into the memo list '{0}'"
+msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to move an event into the calendar '{0}'"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
+
+#. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:95
-msgid "Error on {0}: {1}"
-msgstr "Virhe kohteessa {0}: {1}"
+#, fuzzy
+#| msgid "Unable to find this task in any task list"
+msgid "Failed to move a task into the task list '{0}'"
+msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../calendar/calendar.error.xml.h:96
-#| msgid "Could not open destination"
-msgid "Could not perform this operation."
-msgstr "Toimenpiteen suoritus epäonnistui."
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:97
+#, fuzzy
+#| msgid "Unable to find this memo in any memo list"
+msgid "Failed to move a memo into the memo list '{0}'"
+msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
-msgid "You must be working online to complete this operation."
-msgstr ""
-"Verkkoyhteyden tulee olla muodostettu, jotta tämä toimenpide on mahdollista "
-"suorittaa."
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Copying an event into the calendar '{0}'"
+msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:88
-msgid "Day View"
-msgstr "Päivänäkymä"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:101
+#, fuzzy
+#| msgid "Show task preview below the task list"
+msgid "Copying a task into the task list '{0}'"
+msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../calendar/gui/calendar-view-factory.c:91
-msgid "Work Week View"
-msgstr "Työviikon näkymä"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:103
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Copying a memo into the memo list '{0}'"
+msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/calendar-view-factory.c:94
-msgid "Week View"
-msgstr "Työviikko"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Moving an event into the calendar '{0}'"
+msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:97
-msgid "Month View"
-msgstr "Kuukausinäkymä"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:107
+#, fuzzy
+#| msgid "Show task preview below the task list"
+msgid "Moving a task into the task list '{0}'"
+msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:109
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Moving a memo into the memo list '{0}'"
+msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
 msgid "Summary"
 msgstr "Kuvaus"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
 msgid "contains"
 msgstr "sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
 msgid "does not contain"
 msgstr "ei sisällä"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:528
-#: ../widgets/table/e-table-config.ui.h:24
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2239,30 +2216,35 @@ msgid "Classification"
 msgstr "Luokittelu"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
 msgid "is"
 msgstr "on"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
 msgid "is not"
 msgstr "ei ole"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
-#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
-#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
@@ -2279,37 +2261,37 @@ msgstr "Osanottaja"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:870
+#: ../plugins/publish-calendar/publish-calendar.c:897
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
 msgstr "Sijainti"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Luokka"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Liitteet"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
 msgid "Exist"
 msgstr "On olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Toistuvuus"
@@ -2340,30 +2322,46 @@ msgstr "Yhteenveto sisältää"
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 msgid "Edit Reminder"
 msgstr "Muokkaa muistutusta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Soita ääni"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
+msgid "before"
+msgstr "ennen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
+msgid "after"
+msgstr "jälkeen"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
+msgid "start of appointment"
+msgstr "tapaamisen alkua"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
+msgid "end of appointment"
+msgstr "tapaamisen päättymistä"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "minute(s)"
 msgstr "minuutti(a)"
@@ -2376,81 +2374,65 @@ msgstr "tunti(a)"
 msgid "day(s)"
 msgstr "päivä(ä)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "before"
-msgstr "ennen"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-msgid "after"
-msgstr "jälkeen"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-msgid "start of appointment"
-msgstr "tapaamisen alkua"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "end of appointment"
-msgstr "tapaamisen päättymistä"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Add Reminder"
 msgstr "Lisää muistutus"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Repeat"
 msgstr "Toista"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Repeat the reminder"
 msgstr "_Toista muistutus"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "extra times every"
 msgstr "ylimääräistä kertaa joka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "Asetukset"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "Mes_sage:"
 msgstr "_Viesti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom reminder sound"
 msgstr "Oma _hälytysääni muistutukselle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "_Sound:"
 msgstr "_Ääni:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Select A File"
 msgstr "Valitse tiedosto"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "Send To:"
 msgstr "Lähetä:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "Toimenpide/liipaisin"
 
@@ -2476,308 +2458,308 @@ msgstr "Tehtävä on poistettu."
 msgid "This memo has been deleted."
 msgstr "Muistilappu on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s olet tehnyt muutoksia. Unohda nämä muutokset ja sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Et ole tehnyt muutoksia, sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Tapahtumaa on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Tehtävää on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Muistilappua on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 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:103
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "Liitteitä ei voitu tallentaa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:754
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:780
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:785
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:801
+#: ../calendar/gui/dialogs/comp-editor.c:792
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:913
 msgid "Keep original item?"
 msgstr "Säilytetäänkö alkuperäinen?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1108
+#| msgid "Unable to connect to the GroupWise server."
+msgid "Unable to synchronize with the server"
+msgstr "Synkronointi palvelimen kanssa ei onnistu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1423
-#: ../widgets/misc/e-web-view-gtkhtml.c:456
-#: ../widgets/misc/e-web-view-gtkhtml.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1249 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1417 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
+#: ../e-util/e-web-view.c:1243 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
+#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "View help"
 msgstr "Näytä ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1429 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
+#: ../e-util/e-web-view.c:1255 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:294
-#| msgid "_Save and Close"
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../e-util/e-mail-signature-editor.c:317
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1285
 msgid "Save current changes and close editor"
 msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234
+#: ../calendar/gui/dialogs/comp-editor.c:1299
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:299
+#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1327
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1334
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1288
-#: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:414
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1304
+#: ../calendar/gui/dialogs/comp-editor.c:1369
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1380
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1394
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1355
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2650
-#: ../calendar/gui/dialogs/comp-editor.c:3654
+#: ../calendar/gui/dialogs/comp-editor.c:2541
+#: ../calendar/gui/dialogs/comp-editor.c:2751
+#: ../calendar/gui/dialogs/comp-editor.c:3764
 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:3618
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
+#: ../calendar/gui/dialogs/comp-editor.c:3726
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3686
+#: ../calendar/gui/dialogs/comp-editor.c:3796
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:439
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/copy-source-dialog.c:121
 msgid "Could not open destination"
 msgstr "Kohdetta ei voi avata"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:126
+#: ../calendar/gui/dialogs/copy-source-dialog.c:131
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:160
-#, fuzzy
+#: ../calendar/gui/dialogs/copy-source-dialog.c:173
 msgid "Cannot create object"
-msgstr "Uutta tapahtumaa ei voi luoda"
+msgstr "Objektia ei voi luoda"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:189
+#: ../calendar/gui/dialogs/copy-source-dialog.c:204
 msgid "Could not open source"
 msgstr "Lähdettä ei voi avata"
 
-#: ../calendar/gui/dialogs/delete-comp.c:212
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
+#: ../calendar/gui/dialogs/delete-comp.c:219
 msgid "_Retract comment"
 msgstr "_Poista kommentti"
 
@@ -2857,169 +2839,163 @@ msgstr "Valtuuta:"
 msgid "Contacts..."
 msgstr "Yhteystiedot..."
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "T_oistuvuus"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "Muuta tämä tapahtuma toistuvaksi"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "Lisää erityisiä lähetysvaihtoehtoja"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:245
 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:265
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Vapaa/Varattu"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3391
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "Tulosta tämä tapahtuma"
 
-#: ../calendar/gui/dialogs/event-page.c:570
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "Tapahtuman aloitusaika on mennyt"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 
-#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:638
 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:663
-#: ../calendar/gui/dialogs/event-page.c:3143
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3168
 msgid "This event has reminders"
 msgstr "Tapahtumaan liittyy muistutuksia"
 
-#: ../calendar/gui/dialogs/event-page.c:730
+#: ../calendar/gui/dialogs/event-page.c:717
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1303
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1306
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../calendar/gui/dialogs/event-page.c:1477
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:1026
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1487
+#: ../calendar/gui/dialogs/event-page.c:1490
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1510
+#: ../calendar/gui/dialogs/event-page.c:1514
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1517
+#: ../calendar/gui/dialogs/event-page.c:1522
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1680
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/memo-page.c:765
+#: ../calendar/gui/dialogs/task-page.c:1080
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1714
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1721
+#: ../calendar/gui/dialogs/task-page.c:1115
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1921
+#: ../calendar/gui/dialogs/event-page.c:1927
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:1929
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:2998
-#, c-format
-msgid "Unable to open the calendar '%s': %s"
-msgstr "Kalenterin '%s' avaus ei onnistu: %s"
-
-#: ../calendar/gui/dialogs/event-page.c:3423
+#: ../calendar/gui/dialogs/event-page.c:3448
 #, 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:3429
+#: ../calendar/gui/dialogs/event-page.c:3454
 #, 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:3435
+#: ../calendar/gui/dialogs/event-page.c:3460
 #, 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:3454
+#: ../calendar/gui/dialogs/event-page.c:3481
 msgid "Customize"
 msgstr "Muokkaa"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3488
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
@@ -3060,8 +3036,8 @@ msgstr "_Sijainti:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../widgets/misc/e-attachment-dialog.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "K_uvaus:"
 
@@ -3070,7 +3046,7 @@ msgid "_Time:"
 msgstr "_Aika:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
@@ -3083,8 +3059,8 @@ msgid "Event Description"
 msgstr "Tapahtuman kuvaus"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
@@ -3149,69 +3125,49 @@ msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3395
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Tulosta tämä muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:429
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr "Muistilapun aloitusaika on mennyt"
 
-#: ../calendar/gui/dialogs/memo-page.c:465
+#: ../calendar/gui/dialogs/memo-page.c:457
 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:469
+#: ../calendar/gui/dialogs/memo-page.c:461
 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:981
-#, fuzzy, c-format
-msgid "Unable to open memos in '%s': %s"
-msgstr "Muistilappuja kohteesta '%s' ei voi avata."
-
-#: ../calendar/gui/dialogs/memo-page.c:983
-#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:107
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
-#: ../em-format/e-mail-parser-multipart-encrypted.c:122
-#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:722 ../mail/e-mail-reader.c:1733
-#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4574
-#: ../modules/itip-formatter/itip-view.c:4925 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: ../calendar/gui/dialogs/memo-page.c:1173
-#: ../em-format/e-mail-formatter.c:1370
-#: ../em-format/e-mail-formatter-utils.c:180
-#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
+#: ../calendar/gui/dialogs/memo-page.c:1160
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:229
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "Vastaanottaja"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:346
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-#, fuzzy
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
-msgstr "_Sukunimi:"
+msgstr "_Luettelo:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:354
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "_Järjestäjä:"
 
@@ -3220,12 +3176,12 @@ msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
@@ -3265,22 +3221,22 @@ msgstr "Tätä ja tulevia kertoja"
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 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:969
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "Käytössä"
 
@@ -3288,7 +3244,7 @@ msgstr "Käytössä"
 #. * (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:1106
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "ensimmäinen"
 
@@ -3297,7 +3253,7 @@ msgstr "ensimmäinen"
 #. * (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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "toinen"
 
@@ -3305,7 +3261,7 @@ msgstr "toinen"
 #. * (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:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "kolmas"
 
@@ -3313,7 +3269,7 @@ msgstr "kolmas"
 #. * (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:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "neljäs"
 
@@ -3321,7 +3277,7 @@ msgstr "neljäs"
 #. * (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:1127
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "viides"
 
@@ -3329,13 +3285,13 @@ msgstr "viides"
 #. * (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:1132
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 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:1156
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "Toinen päiväys"
 
@@ -3343,7 +3299,7 @@ msgstr "Toinen päiväys"
 #. * 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:1162
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "1. - 10."
 
@@ -3351,7 +3307,7 @@ msgstr "1. - 10."
 #. * 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:1168
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "11. - 20."
 
@@ -3359,73 +3315,73 @@ msgstr "11. - 20."
 #. * 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:1174
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "21. - 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1203
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Sunnuntai"
 
 #. 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:1330
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1509
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2225
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2266
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2272
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2316
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2455
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -3487,250 +3443,227 @@ msgstr "Poikkeukset"
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: ../calendar/gui/dialogs/send-comp.c:196
+#: ../calendar/gui/dialogs/send-comp.c:173
+#: ../calendar/gui/dialogs/send-comp.c:255
 #, fuzzy
 msgid "Send my reminders with this event"
 msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:175
+#: ../calendar/gui/dialogs/send-comp.c:257
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../calendar/gui/dialogs/task-details-page.c:355
-#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "_Lähetysasetukset"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Tehtävä"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "Tulosta tämä tehtävä"
+
+#: ../calendar/gui/dialogs/task-page.c:330
+msgid "Task's start date is in the past"
+msgstr "Tehtävän aloitusaika on mennyt"
+
+#: ../calendar/gui/dialogs/task-page.c:331
+msgid "Task's due date is in the past"
+msgstr "Tehtävän aloitusaika on mennyt"
+
+#: ../calendar/gui/dialogs/task-page.c:364
+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:368
+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:372
+#, fuzzy
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
+
+#: ../calendar/gui/dialogs/task-page.c:1007
+msgid "Due date is wrong"
+msgstr "Eräpäivä on virheellinen"
+
+#: ../calendar/gui/dialogs/task-page.c:1175
+#: ../calendar/gui/dialogs/task-page.c:1200
 msgid "Completed date is wrong"
 msgstr "Valmistumispäivä on väärin"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
-msgid "Web Page"
-msgstr "WWW-sivu"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:345
-#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
 msgid "High"
 msgstr "Korkea"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:347
-#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
-#: ../widgets/misc/e-send-options.ui.h:5
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:319
 msgid "Normal"
 msgstr "Tavallinen"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:349
-#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
 msgid "Low"
 msgstr "Matala"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
-msgstr "Määrittelemätön"
+msgstr "Määrittämätön"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3472 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/dialogs/task-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:330
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
-#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/dialogs/task-page.ui.h:18
+#: ../calendar/gui/e-cal-component-preview.c:320
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "Työn alla"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:324
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3478
+#: ../calendar/gui/dialogs/task-page.ui.h:20
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:557
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "Valmis"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3481 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/dialogs/task-page.ui.h:22
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3624
-#: ../calendar/gui/e-meeting-list-view.c:684
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "Tila"
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "_Eräpäivä:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-msgid "Stat_us:"
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "Aikavyöhyke:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#| msgid "Status:"
+msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:19
-msgid "P_ercent complete:"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+#| msgid "_Date completed:"
+msgid "Date _completed:"
+msgstr "_Valmistumispäivä:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+#| msgid "P_ercent complete:"
+msgid "_Percent complete:"
 msgstr "Pros_enttia valmiina:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "_Priority:"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+#| msgid "Priority:"
+msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr "_Valmistumispäivä:"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+#| msgid "_Classification:"
+msgid "C_lassification:"
+msgstr "Lu_okittelu:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
-msgid "_Status Details"
-msgstr "_Tilan yksityiskohdat"
-
-#: ../calendar/gui/dialogs/task-editor.c:118
-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"
-
-#: ../calendar/gui/dialogs/task-editor.c:126
-msgid "_Send Options"
-msgstr "_Lähetysasetukset"
-
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3393
-#: ../widgets/misc/e-send-options.c:553
-msgid "Task"
-msgstr "Tehtävä"
-
-#: ../calendar/gui/dialogs/task-editor.c:307
-msgid "Task Details"
-msgstr "Tehtävän yksityiskohdat"
-
-#: ../calendar/gui/dialogs/task-editor.c:351
-msgid "Print this task"
-msgstr "Tulosta tämä tehtävä"
-
-#: ../calendar/gui/dialogs/task-page.c:259
-msgid "Task's start date is in the past"
-msgstr "Tehtävän aloitusaika on mennyt"
-
-#: ../calendar/gui/dialogs/task-page.c:260
-msgid "Task's due date is in the past"
-msgstr "Tehtävän aloitusaika on mennyt"
-
-#: ../calendar/gui/dialogs/task-page.c:293
-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:297
-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:301
-#, fuzzy
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
-
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "Eräpäivä on virheellinen"
-
-#: ../calendar/gui/dialogs/task-page.c:1813
-#, fuzzy, c-format
-msgid "Unable to open tasks in '%s': %s"
-msgstr "Tehtäviä kohteesta '%s' ei voi avata."
-
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "_Eräpäivä:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "Aikavyöhyke:"
-
-#: ../calendar/gui/ea-cal-view.c:320
+#: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/ea-cal-view.c:321
+#: ../calendar/gui/ea-cal-view.c:325
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view.c:322
+#: ../calendar/gui/ea-cal-view.c:326
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:327
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:328
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
-#: ../calendar/gui/ea-cal-view-event.c:291
+#: ../calendar/gui/ea-cal-view-event.c:298
 msgid "It has reminders."
 msgstr "Sisältää muistutuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:294
+#: ../calendar/gui/ea-cal-view-event.c:301
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:304
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:311
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:307
+#: ../calendar/gui/ea-cal-view-event.c:314
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../calendar/gui/ea-cal-view-event.c:329
+#: ../calendar/gui/ea-cal-view-event.c:337
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view-event.c:558
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3739,49 +3672,43 @@ 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:156 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
 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:163
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Work Week View: %s. %s"
 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:169
+#: ../calendar/gui/ea-day-view.c:176
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päivänäkymä: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:210
 msgid "calendar view for a work week"
 msgstr "kalenterin näkymä työviikkoon"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:212
 msgid "calendar view for one or more days"
 msgstr "Kalenterinäkymä yhdelle tai useammalle päivälle"
 
-#: ../calendar/gui/ea-day-view-main-item.c:319
-#: ../calendar/gui/ea-week-view-main-item.c:345
+#: ../calendar/gui/ea-day-view-main-item.c:327
+#: ../calendar/gui/ea-week-view-main-item.c:354
 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-gnome-calendar.c:48
 #: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1114
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenteri"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1225
 msgid "%A %d %b %Y"
-msgstr "%A %d. %Bta %Y"
+msgstr "%A %e. %Bta %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. * %b = abbreviated month name. Don't use any other specifiers.
@@ -3789,44 +3716,44 @@ msgstr "%A %d. %Bta %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
-#: ../calendar/gui/e-day-view-top-item.c:835
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1108
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1229
 msgid "%a %d %b"
-msgstr "%a %d %b"
+msgstr "%a %e. %bta"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1111
-#: ../modules/calendar/e-cal-shell-view-private.c:1117
-#: ../modules/calendar/e-cal-shell-view-private.c:1120
+#: ../calendar/gui/ea-gnome-calendar.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:220
+#: ../modules/calendar/e-cal-shell-view-private.c:1232
+#: ../modules/calendar/e-cal-shell-view-private.c:1238
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
 msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1137
-#: ../modules/calendar/e-cal-shell-view-private.c:1148
-#: ../modules/calendar/e-cal-shell-view-private.c:1155
-#: ../modules/calendar/e-cal-shell-view-private.c:1158
+msgstr "%a %e. %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:239
+#: ../calendar/gui/ea-gnome-calendar.c:247
+#: ../calendar/gui/ea-gnome-calendar.c:254
+#: ../calendar/gui/ea-gnome-calendar.c:257
+#: ../modules/calendar/e-cal-shell-view-private.c:1258
+#: ../modules/calendar/e-cal-shell-view-private.c:1269
+#: ../modules/calendar/e-cal-shell-view-private.c:1276
+#: ../modules/calendar/e-cal-shell-view-private.c:1279
 msgid "%d %b %Y"
-msgstr "%d. %Bta %Y"
+msgstr "%e. %Bta %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. * Don't use any other specifiers.
 #. 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/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
-#: ../calendar/gui/e-day-view-top-item.c:839
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1144
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1265
 msgid "%d %b"
-msgstr "%d %b"
+msgstr "%e. %b"
 
 #: ../calendar/gui/ea-jump-button.c:151
 msgid "Jump button"
@@ -3856,109 +3783,100 @@ msgstr[1] "%d viikkoa"
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:441
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ennen tapaamisen alkua"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:445
+#: ../calendar/gui/e-alarm-list.c:447
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tapaamisen alun jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s tapaamisen alussa"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ennen tapaamisen loppumista"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:472
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tapaamisen päättymisen jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s tapaamisen lopussa"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:507
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipaisintyypille"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuukausinäkymä: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:168
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Työviikko: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:202
 msgid "calendar view for a month"
 msgstr "kalenterin kuukausinäkymä"
 
-#: ../calendar/gui/ea-week-view.c:199
+#: ../calendar/gui/ea-week-view.c:204
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:751
+#: ../calendar/gui/e-cal-component-preview.c:231 ../e-util/e-filter-rule.c:750
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:280
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
-#| msgid "End Date"
+#: ../calendar/gui/e-cal-component-preview.c:292
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:306
+#: ../calendar/gui/e-cal-component-preview.c:304
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1475
-#: ../modules/itip-formatter/itip-view.c:1592
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "Tila:"
 
@@ -3966,12 +3884,12 @@ msgstr "Tila:"
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:368
 #: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:397
+#: ../calendar/gui/e-cal-component-preview.c:399
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
@@ -3984,11 +3902,11 @@ msgid "Start date"
 msgstr "Aloituspäivä"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:157
-#: ../widgets/misc/e-attachment-tree-view.c:586
+#: ../e-util/e-attachment-tree-view.c:586
+#: ../mail/e-mail-account-tree-view.c:159
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -3996,7 +3914,7 @@ msgstr "Tyyppi"
 msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
 msgid "Complete"
 msgstr "Valmis"
 
@@ -4011,14 +3929,25 @@ msgstr "% valmiina"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Priority"
 msgstr "Prioriteetti"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+msgstr "Tila"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Created"
 msgstr "Luotu"
 
@@ -4028,37 +3957,37 @@ msgstr "Luotu"
 msgid "Last modified"
 msgstr "Viimeksi muokattu"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:283
+#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
-#: ../calendar/gui/e-task-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
 #. 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:1992 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:824
+#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -4066,20 +3995,21 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:828
+#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3427
+#: ../calendar/gui/e-calendar-view.c:2104
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../calendar/gui/e-calendar-view.c:2135
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -4093,86 +4023,81 @@ msgstr "Aloituspäivä"
 msgid "End Date"
 msgstr "Päättymispäivä"
 
-#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1222
-#: ../calendar/gui/print.c:1239 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3480
-#: ../modules/itip-formatter/itip-view.c:6012
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:6080
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1657
+#: ../calendar/gui/e-cal-model.c:1668
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1659
+#: ../calendar/gui/e-cal-model.c:1670
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1075
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:211
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:3114
-#, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
-
-#: ../calendar/gui/e-cal-model.c:3565
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:6000
+#: ../calendar/gui/e-cal-model.c:3958
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:6068
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-cal-model.c:3566
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6006
+#: ../calendar/gui/e-cal-model.c:3959
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:6074
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-cal-model.c:3567
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-cal-model.c:3960
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-cal-model.c:3568
-#: ../calendar/gui/e-meeting-list-view.c:225
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:6009
+#: ../calendar/gui/e-cal-model.c:3961
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6077
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-cal-model.c:3569
+#: ../calendar/gui/e-cal-model.c:3962
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:633
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:720
+#: ../calendar/gui/e-cal-model-tasks.c:499
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4183,22 +4108,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:772
+#: ../calendar/gui/e-cal-model-tasks.c:551
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I.%M.%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4208,16 +4133,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:1048 ../calendar/gui/print.c:1067
-#: ../calendar/gui/print.c:2564 ../calendar/gui/print.c:2584
+#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:1053 ../calendar/gui/print.c:1069
-#: ../calendar/gui/print.c:2569 ../calendar/gui/print.c:2586
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
 msgid "pm"
 msgstr "pm"
 
@@ -4227,13 +4152,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:2044
+#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2673
+#: ../calendar/gui/e-day-view.c:3433
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -4244,191 +4169,204 @@ msgstr "Viikko %d"
 #. * 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:790
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
 
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:826
 msgid "Show the second time zone"
 msgstr "Näytä toinen aikavyöhyke"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:832
-#: ../modules/calendar/e-calendar-preferences.c:185
-#: ../modules/calendar/e-calendar-preferences.c:237
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-day-view-time-item.c:866
-#: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:268
+#: ../calendar/gui/e-day-view-time-item.c:877
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "Valitse..."
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1218
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "Henkilö"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1219 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1220
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "Resurssi"
 
-#: ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1221
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "Huone"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1235
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1236
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1237
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 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:619
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:671
+#: ../calendar/gui/e-meeting-list-view.c:681
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "Työn alla"
 
-#: ../calendar/gui/e-meeting-store.c:1906
+#: ../calendar/gui/e-meeting-store.c:1910
 #, fuzzy, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Syötä salasana käyttäjälle %s palvelimeen %s"
 
-#: ../calendar/gui/e-meeting-store.c:1916
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1921
-#: ../plugins/publish-calendar/publish-calendar.c:335
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:351
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "Syötä salasana"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "Näytä _etäämpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:684
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:719
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:741
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:751
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:843
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
+#: ../calendar/gui/e-meeting-time-sel.c:2660
+#, c-format
+#| msgid "Location: %s"
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr ""
+"Yhteenveto: %s\n"
+"Sijainti: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
+#, c-format
+msgid "Summary: %s"
+msgstr "Yhteenveto: %s"
+
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Lisää läsnäolija tästä"
@@ -4453,46 +4391,46 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "Muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:745
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../calendar/gui/e-memo-table.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:763
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -4504,84 +4442,84 @@ msgstr "Lisää muistilappu tästä"
 #. * %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:608
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2353
-#: ../calendar/importers/icalendar-importer.c:84
-#: ../calendar/importers/icalendar-importer.c:1082
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1040
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1028
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1034
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../calendar/gui/e-task-table.c:1040
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1064
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
-#: ../calendar/gui/e-timezone-entry.c:333
+#: ../calendar/gui/e-timezone-entry.c:335
 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:2025
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2318
+#: ../calendar/gui/gnome-cal.c:2369
 msgid "Purging"
 msgstr "Tyhjennetään"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:918
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -4589,7 +4527,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:955
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -4598,7 +4536,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:962
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -4610,7 +4548,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:969 ../calendar/gui/itip-utils.c:1017
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -4619,7 +4557,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:976
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -4627,7 +4565,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:989
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -4635,7 +4573,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:996
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -4643,7 +4581,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:1003
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -4651,253 +4589,259 @@ 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:1010
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:1088
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:1123
+#: ../calendar/gui/itip-utils.c:1144
 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:1127
-msgid "Unable to book a resource, error: "
-msgstr "Resurssia ei voida varata, virhe: "
+#: ../calendar/gui/itip-utils.c:1152
+#, c-format
+#| msgid "Unable to book a resource, error: "
+msgid "Unable to book a resource, error: %s"
+msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:715
-msgid "Su"
-msgstr "Su"
-
-#: ../calendar/gui/print.c:715
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:715
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:715
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "Ke"
 
-#: ../calendar/gui/print.c:716
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:716
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:716
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "La"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "Su"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3220
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3230
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3236
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3246
+#: ../calendar/gui/print.c:3354
 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:3253
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/print.c:3418
-#, c-format
-msgid "Summary: %s"
-msgstr "Yhteenveto: %s"
-
-#: ../calendar/gui/print.c:3445
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../calendar/gui/print.c:3488
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:3503
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:3521
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:3532
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3545
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:3556
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -4905,203 +4849,194 @@ msgstr "Yhteystiedot: "
 msgid "In progress"
 msgstr "Kesken"
 
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "Peruttu"
-
 #: ../calendar/gui/tasktypes.xml.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% valmiina"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
-#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:468
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5614
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:616
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:617
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:791
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:792
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1075
+#: ../calendar/importers/icalendar-importer.c:1071
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:1119
+#: ../calendar/importers/icalendar-importer.c:1115
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../calendar/importers/icalendar-importer.c:1190
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/importers/icalendar-importer.c:1193
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1201
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1207
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "is an instance"
-msgstr "Tätä ja edellisiä kertoja"
+msgstr "on instanssi"
 
-#: ../calendar/importers/icalendar-importer.c:1212
+#: ../calendar/importers/icalendar-importer.c:1211
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1235
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1245
-#: ../calendar/importers/icalendar-importer.c:1546
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1250
 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:1259
-#: ../calendar/importers/icalendar-importer.c:1542
+#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1270
+#: ../calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1281
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1292
+#: ../calendar/importers/icalendar-importer.c:1291
 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:1316
+#: ../calendar/importers/icalendar-importer.c:1315
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1324
+#: ../calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1335
-#: ../calendar/importers/icalendar-importer.c:1338
+#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1337
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1358
-#: ../calendar/importers/icalendar-importer.c:1361
+#: ../calendar/importers/icalendar-importer.c:1357
+#: ../calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/importers/icalendar-importer.c:1375
+#: ../calendar/importers/icalendar-importer.c:1374
 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:1538
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -6654,164 +6589,164 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
+#: ../composer/e-composer-actions.c:276
+#: ../e-util/e-mail-signature-editor.c:308
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:327
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Näytä kokoelma kuvia, joita voi raahata viesteihin"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:395
 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:420
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: ../composer/e-composer-header-table.c:48
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6819,40 +6754,40 @@ msgstr ""
 "Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut "
 "vastaanottajat näkevät vastaanottajia"
 
-#: ../composer/e-composer-header-table.c:849
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../composer/e-composer-header-table.c:856
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:867
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:873
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:878
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:882
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../composer/e-composer-header-table.c:813
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tästä"
 
@@ -6860,11 +6795,7 @@ msgstr "Avaa osoitekirja tästä"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../composer/e-composer-private.c:347
-msgid "Save draft"
-msgstr "Tallenna luonnos"
-
-#: ../composer/e-msg-composer.c:856
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6872,7 +6803,7 @@ msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:865
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6881,16 +6812,16 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4204
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "(Muokkain sisältää viestin rungon joka ei ole tekstiä ja jota ei voi muokata)"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
@@ -7005,7 +6936,7 @@ msgstr "Tapahtui virhe tulostettaessa"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr ""
+msgstr "Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei lähetetty."
 
 #: ../composer/mail-composer.error.xml.h:27
 #, fuzzy
@@ -7017,16 +6948,16 @@ msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr ""
+"Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei mitä luultavimmin ole "
+"tallennettu."
 
 #: ../composer/mail-composer.error.xml.h:29
-#, fuzzy
 msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "Tapahtui virhe tulostettaessa"
+msgstr "Lähettäessä tapahtui virhe. Kuinka haluat jatkaa?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
-#, fuzzy
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
-msgstr "Virhe säännöllisessä lausekkeessa &quot;{0}&quot;."
+msgstr "Ilmoitettu virhe oli &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:31
 #, fuzzy
@@ -7049,9 +6980,9 @@ msgstr "Tallennetaan viestiä kansioon"
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
 msgstr ""
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
@@ -7062,13 +6993,13 @@ msgstr "Evolutionin hälytysilmoitukset"
 msgid "Calendar event notifications"
 msgstr "Kalenteritapahtumien ilmoitukset"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
@@ -7080,13 +7011,9 @@ msgstr "Evolution-sähköposti ja -kalenteri"
 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 "Email Settings"
-msgstr "Sähköpostin asetukset"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Configure email accounts"
-msgstr "Tee sähköpostitilien asetukset"
+#: ../data/evolution.desktop.in.in.h:5
+msgid "mail;calendar;contact;addressbook;task;"
+msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -7159,14 +7086,12 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#, fuzzy
 msgid "Show maps"
-msgstr "Näytä animaatiot"
+msgstr "Näytä kartat"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-#, fuzzy
 msgid "Whether to show maps in preview pane"
-msgstr "Näytetäänkö esikatselupaneeli."
+msgstr "Näytetäänkö kartat esikatselupaneelissa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
 msgid "Primary address book"
@@ -7803,25 +7728,60 @@ msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Week start"
-msgstr "Viikon alku"
+msgid "First day of the week"
+msgstr "Viikon ensimmäinen päivä"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#, fuzzy
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
+msgid "Monday is a work day"
+msgstr "Maanantai on työpäivä"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Work days"
-msgstr "Työpäivät"
+msgid "Tuesday is a work day"
+msgstr "Tiistai on työpäivä"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+msgid "Wednesday is a work day"
+msgstr "Keskiviikko on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr "Torstai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr "Perjantai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "Lauantai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "Sunnuntai on työpäivä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 #, fuzzy
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "Päivät, joina työtuntien alku ja loppu näytetään kalenterissa."
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr "(Vanhennettu) Työpäivät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#| msgid "Evolution Restore"
 msgid "Previous Evolution version"
 msgstr "Evolutionin edellinen versio"
 
@@ -7833,13 +7793,12 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
-#, fuzzy
 msgid "List of disabled plugins"
-msgstr "Käytä ja poista käytöstä lisäosia"
+msgstr "Luettelo käytöstä poistetuista lisäosista"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
-msgstr ""
+msgstr "Luettelo Evolutionin käytöstä poistetuista lisäosista"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
@@ -7863,7 +7822,7 @@ msgstr "Onko ikkuna suurennettu"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
 msgid "Gnome Calendar's calendar import done"
-msgstr ""
+msgstr "Gnome-kalenterin kalenterituonti valmis"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
 msgid "Whether calendar from Gnome Calendar has been imported or not"
@@ -7897,7 +7856,7 @@ msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
-msgstr ""
+msgstr "Polku, josta kuvagallerian tulisi etsiä sisältöä"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
 msgid ""
@@ -8084,6 +8043,8 @@ msgstr ""
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
+"Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on "
+"allekirjoitettu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
@@ -8168,20 +8129,10 @@ msgid "Can be either 'mbox' or 'pdf'."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Save name format for drag-and-drop operation"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8189,11 +8140,17 @@ msgstr ""
 "Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat "
 "ovat ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#, fuzzy
+#| msgid "Disable or enable ellipsizing of folder names in side bar"
+msgid "Ellipsize mode for folder names in side bar"
+msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8201,19 +8158,11 @@ msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä "
 "interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "Onko kansionimien typistys sivupalkissa poistettu käytöstä."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable or disable magic space bar"
 msgstr "Käytetäänkö maagista välilyöntinäppäintä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8221,155 +8170,120 @@ msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 #, 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "Lataa HTML-viestien kuvat käyttäen HTTP:ta"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-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 "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Lataa HTML-viestien kuvia HTTP(S):n yli. Mahdolliset arvot ovat: \"0\" - älä "
-"koskaan lataa kuvia verkosta, \"1\" - lataa kuvat, jos lähettäjä on "
-"osoitekirjassa ja \"2\" - lataa kuvat aina verkosta."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#| msgid "Load images for HTML messages over HTTP"
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "Lataa HTML-viestien kuvat HTTP:n yli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show all the headers when viewing a messages."
 msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "List of custom headers and whether they are enabled."
-msgstr "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#| msgid "Show all the headers when viewing a messages."
+msgid "List of headers to show when viewing a message."
+msgstr "Luettelo otsakkeista, jotka näytetään viestiä katsellessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 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 "
-"mail view."
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
 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ä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Search for the sender photo in local address books"
-msgstr "Etsi lähettäjän valokuvaa paikallisista osoitekirjoista"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "Tämä ominaisuus helpottaa noudon nopeuden parantamista."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Luettelo MIME-tyypeistä, joista etsitään Bonobo-komponenttikatselimia"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-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 "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"Jos jollekin MIME-tyypille ei ole sisäänrakennettua katselinta "
-"Evolutionissa, voidaan käyttää mitä tahansa Gnomen MIME-"
-"tyyppientietokannassa määriteltyä bonobo-komponentin katselinta viestin "
-"näyttämiseen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 #, fuzzy
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 #, fuzzy
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
@@ -8378,7 +8292,7 @@ msgstr ""
 "Määrittää käytetäänkö samaa kirjasinta sekä \"Lähettäjä\"- että "
 "\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8386,31 +8300,31 @@ msgstr ""
 "Määrittää käytetäänkö samaa kirjasinta sekä \"Lähettäjä\"- että "
 "\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 #, fuzzy
 #| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "Ota hakunäkymät käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 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."
@@ -8419,37 +8333,31 @@ msgstr ""
 "jälkeen.  Tämä peruu sähköpostin valinnan luettelosta ja poistaa esikatselun "
 "kansiolta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-msgid "State of message headers in paned view"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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 "
@@ -8457,35 +8365,35 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen kirjasin viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "The terminal font for mail display."
 msgstr "Päätekirjasin viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia kirjasimia näytettäessä viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8493,11 +8401,11 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8505,11 +8413,11 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin "
 "lukumäärän, jonka jälkeen näytetään '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8517,11 +8425,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8529,11 +8437,11 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
 "Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Järjestetäänkö säikeet säikeen viimeisen viestin mukaan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 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 "
@@ -8543,11 +8451,11 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8555,69 +8463,69 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Default reply style"
+msgstr "Vastauksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt when emptying the trash"
-msgstr ""
-"Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
+msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt the user when he or she tries to empty the trash."
-msgstr ""
-"Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
+msgstr "Kysy vahvistus käyttäjältä, kun roskakoria ollaan tyhjentämässä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
@@ -8625,7 +8533,7 @@ msgstr ""
 "sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
@@ -8634,21 +8542,21 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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ä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8656,11 +8564,11 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8668,19 +8576,19 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
 "todella tehdä sen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Näytetäänkö kehto merkittäessä useita viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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 "
@@ -8689,11 +8597,11 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8701,11 +8609,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8713,12 +8621,12 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -8727,25 +8635,25 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -8754,53 +8662,47 @@ msgstr ""
 "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
 "synkronointia yhteydettömään tilaan siirryttäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 #, fuzzy
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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ä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -8808,22 +8710,22 @@ msgstr ""
 "Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), "
 "\"1\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show original \"Date\" header value."
-msgstr ""
+msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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."
@@ -8831,47 +8733,47 @@ 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."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 #, fuzzy
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 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 "
@@ -8881,11 +8783,11 @@ msgstr ""
 "Jos oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä "
 "olevia lisäosia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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 "
@@ -8898,7 +8800,7 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
 "osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -8906,7 +8808,7 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta "
 "varten vain paikallisista osoitekirjoista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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 "
@@ -8916,12 +8818,12 @@ msgstr ""
 "määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
 "joille ei tehdä roskapostisuodatusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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 "
@@ -8931,11 +8833,11 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -8943,53 +8845,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
 "kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Check for new messages in all active accounts"
-msgstr "T_arkista uudet viestit joka"
+msgstr "Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -8997,13 +8898,72 @@ msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan "
 "postipalvelimelle. Aikavälin täytyy olla vähintään 30 sekuntia."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#, fuzzy
+#| msgid "Default forward style"
+msgid "(Deprecated) Default forward style"
+msgstr "Välityksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#, fuzzy
+#| msgid "Default reply style"
+msgid "(Deprecated) Default reply style"
+msgstr "Vastauksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#, fuzzy
+#| msgid "List of custom headers and whether they are enabled."
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#, fuzzy
+#| msgid "Load images for HTML messages over HTTP"
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "Lataa HTML-viestien kuvat käyttäen HTTP:ta"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr ""
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
 msgid "['attachment','attaching','attached','enclosed']"
-msgstr ""
-"['attachment','attaching','attached','enclosed,'liite','liitteenä','liitän']"
+msgstr "['attachment','attaching','attached','enclosed,'liite','liitteenä','liitän']"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
@@ -9101,7 +9061,6 @@ msgid "The default command that must be used as the editor."
 msgstr "Oletuskomento, jota käytetään ulkoisena muokkaimena."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "Käynnistä automaattisesti uutta viestiä muokattaessa"
 
@@ -9292,7 +9251,7 @@ msgstr "Tiedostovalitsimen oletuskansio"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser-ikkunoiden oletuskansio."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:313
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -9387,223 +9346,151 @@ msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Socket path for SpamAssassin"
-msgstr ""
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-msgid "Use SpamAssassin daemon and client"
-msgstr "Käytä Spamassassin-palvelinta ja -asiakasta"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Käytä Spamassassin-palvelinta ja -asiakasta (spamc/spamd)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid "SpamAssassin client binary"
-msgstr "Spamassassin-ohjelman binääri"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-msgid "SpamAssassin daemon binary"
-msgstr "Spamassassin-taustapalvelun binääri"
-
-#: ../em-format/e-mail-formatter-attachment.c:364
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
-#: ../widgets/misc/e-attachment-bar.c:106
-#: ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
+#: ../em-format/e-mail-formatter-attachment.c:397
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../em-format/e-mail-formatter-attachment.c:370
-#, fuzzy
+#: ../em-format/e-mail-formatter-attachment.c:398
 #| msgctxt "iCalImp"
 #| msgid "has attachments"
 msgid "Display as attachment"
-msgstr "sisältää liitteitä"
+msgstr "Näytä liitteenä"
 
-#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Vastausosoite"
-
-#: ../em-format/e-mail-formatter.c:1371
-#: ../em-format/e-mail-formatter-utils.c:182
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../modules/mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Kopiot"
-
-#: ../em-format/e-mail-formatter.c:1372
-#: ../em-format/e-mail-formatter-utils.c:184
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../modules/mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Piilokopiot"
-
-#: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:165
-#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
-#: ../smime/lib/e-cert.c:1125
-msgid "Subject"
-msgstr "Aihe"
-
-#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
-msgid "Date"
-msgstr "Päiväys"
-
-#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Uutisryhmät"
-
-#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "Kasvokuva"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:114
-#: ../plugins/mail-notification/mail-notification.c:396
-#, c-format
-msgid "From: %s"
-msgstr "Lähettäjä: %s"
-
-#: ../em-format/e-mail-formatter-headers.c:134
-#: ../em-format/e-mail-formatter-headers.c:139
+#: ../em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(Ei aihetta)"
 
-#: ../em-format/e-mail-formatter-headers.c:340
+#: ../em-format/e-mail-formatter-headers.c:333
 #, 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"
 
 #: ../em-format/e-mail-formatter-image.c:152
-#, fuzzy
 #| msgid "Save Image"
 msgid "Regular Image"
-msgstr "Tallenna kuva"
+msgstr "Tavallinen kuva"
 
-#: ../em-format/e-mail-formatter-image.c:158
+#: ../em-format/e-mail-formatter-image.c:153
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display part as an image"
 msgstr "Näytä seuraava viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:237
+#: ../em-format/e-mail-formatter-message-rfc822.c:252
 msgid "RFC822 message"
 msgstr "RFC822-viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#: ../em-format/e-mail-formatter-message-rfc822.c:253
 #, fuzzy
 #| msgid "Formatting message"
 msgid "Format part as an RFC822 message"
 msgstr "Muotoillaan viestiä"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
-#: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
+#: ../modules/cal-config-google/e-google-chooser.c:237
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "Nimi"
 
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:130
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
-msgid "Security"
-msgstr "Turvallisuus"
-
-#: ../em-format/e-mail-formatter-print-headers.c:147
-#, fuzzy
+#: ../em-format/e-mail-formatter-print-headers.c:144
 #| msgid "Assigned"
 msgid "GPG signed"
-msgstr "Annettu tehtäväksi"
+msgstr "GPG-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:152
-#, fuzzy
+#: ../em-format/e-mail-formatter-print-headers.c:150
 #| msgid "Unencrypted"
 msgid "GPG encrpyted"
-msgstr "Salaamaton"
+msgstr "GPG-salattu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:158
-#, fuzzy
+#: ../em-format/e-mail-formatter-print-headers.c:156
 #| msgid "S/MIME Sig_n"
 msgid "S/MIME signed"
-msgstr "S/MIME-a_llekirjoitus"
+msgstr "S/MIME-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:164
-#, fuzzy
+#: ../em-format/e-mail-formatter-print-headers.c:162
 #| msgid "S/MIME En_crypt"
 msgid "S/MIME encrpyted"
-msgstr "S/_MIME-salaus"
+msgstr "S/MIME-salattu"
+
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "Turvallisuus"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+msgid "Subject"
+msgstr "Aihe"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:176
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1121
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:359
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "Postittaja"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
-#: ../em-format/e-mail-formatter-text-enriched.c:115
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:104
 msgid "Richtext"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
-#: ../em-format/e-mail-formatter-text-enriched.c:121
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:105
 msgid "Display part as enriched text"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:104
-#: ../em-format/e-mail-formatter-text-html.c:340
+#: ../em-format/e-mail-formatter-quote-text-html.c:90
+#: ../em-format/e-mail-formatter-text-html.c:353
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:110
-#: ../em-format/e-mail-formatter-text-html.c:346
+#: ../em-format/e-mail-formatter-quote-text-html.c:91
+#: ../em-format/e-mail-formatter-text-html.c:354
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:182
-#, fuzzy
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:194
 #| msgid "Plain Text Mode"
 msgid "Plain Text"
-msgstr "Raakatekstin tila"
+msgstr "Raakateksti"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:188
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:195
 #, fuzzy
 #| msgid "Only ever show plain text"
 msgid "Format part as plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9611,11 +9498,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9623,11 +9510,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9635,11 +9522,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9647,11 +9534,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9659,11 +9546,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9671,11 +9558,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 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 "
@@ -9685,11 +9572,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9697,11 +9584,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 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 "
@@ -9711,139 +9598,851 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:191
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../em-format/e-mail-formatter-secure-button.c:182
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../em-format/e-mail-formatter-secure-button.c:206
+#: ../em-format/e-mail-formatter-secure-button.c:197
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../em-format/e-mail-formatter-source.c:139
-#| msgid "Sources"
+#: ../em-format/e-mail-formatter-source.c:130
 msgid "Source"
 msgstr "Lähde"
 
-#: ../em-format/e-mail-formatter-source.c:145
+#: ../em-format/e-mail-formatter-source.c:131
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../em-format/e-mail-parser-application-mbox.c:108
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../em-format/e-mail-formatter-utils.c:231
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+msgid "Cc"
+msgstr "Kopiot"
+
+#: ../em-format/e-mail-formatter-utils.c:209
+#: ../em-format/e-mail-formatter-utils.c:233
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+msgid "Bcc"
+msgstr "Piilokopiot"
+
+#: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../em-format/e-mail-parser-application-smime.c:104
+#: ../em-format/e-mail-parser-application-smime.c:84
 #, fuzzy, c-format
 #| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse S/MIME message: %s"
 msgstr "PGP/MIME-viestiä ei voitu tulkita"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
 #, fuzzy, c-format
 #| msgid "Could not parse PGP message: "
 msgid "Could not parse PGP message: %s"
 msgstr "PGP-viestiä ei voitu tulkita:"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
-#: ../em-format/e-mail-parser-multipart-signed.c:144
-#, fuzzy, c-format
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
+#: ../em-format/e-mail-parser-multipart-signed.c:128
+#, c-format
 #| msgid "Error verifying signature"
 msgid "Error verifying signature: %s"
-msgstr "Virhe tarkistettaessa allekirjoitusta"
+msgstr "Virhe vahvistaessa allekirjoitusta: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:86
+#: ../em-format/e-mail-parser-message-external.c:69
 #, fuzzy
 #| msgid "Malformed external-body part."
 msgid "Malformed external-body part"
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../em-format/e-mail-parser-message-external.c:118
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:129
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../em-format/e-mail-parser-message-external.c:131
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:167
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:81
-#: ../em-format/e-mail-parser-multipart-signed.c:95
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#: ../em-format/e-mail-parser-multipart-encrypted.c:102
 #, fuzzy, c-format
 #| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP/MIME-viestiä ei voitu tulkita"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:129
+#: ../em-format/e-mail-parser-multipart-signed.c:114
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../em-format/e-mail-part-utils.c:493
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+msgid "Reply-To"
+msgstr "Vastausosoite"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Date"
+msgstr "Päiväys"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+msgid "Newsgroups"
+msgstr "Uutisryhmät"
+
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Kasvokuva"
+
+#: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
 
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Tavallinen"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Salainen"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Erittäin salainen"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Vain sinulle"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Sähköpostin vastaanotto"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "V_astausta pyydetty"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "S_isällä"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "päivää"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "Milloin _sopii"
+
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+msgid "Replies"
+msgstr "Vastaukset"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Viivästä viestin toimitusta"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Jälkeen"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "päivää"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "Aseta _eräpäivä"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Kunnes"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Toimitusvalinnat"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prioriteetti:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "Lu_okittelu:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "_Yleisasetukset"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "_Luo lähetyskohde, jonka tietoja seurataan"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Toimitettu"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "_Toimitettu ja avattu"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Kaikki tiedot"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "Poista lähetetty _automaattisesti"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Tilan seuranta"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Milloin avattu:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Milloin h_ylätty:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Milloin val_mistuu:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Milloin hy_väksytty:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "_Tilan seuranta"
+
+#: ../e-util/e-table-config.ui.h:1
+msgid "_Sort..."
+msgstr "_Järjestä..."
+
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Group By..."
+msgstr "_Ryhmittele..."
+
+#: ../e-util/e-table-config.ui.h:3
+msgid "_Fields Shown..."
+msgstr "_Näytettävät kentät..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "Clear _All"
+msgstr "Tyhjennä k_aikki"
+
+#: ../e-util/e-table-config.ui.h:7
+msgid "_Show field in View"
+msgstr "_Näytä kenttä näkymässä"
+
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+msgid "Ascending"
+msgstr "Nouseva"
+
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+msgid "Descending"
+msgstr "Laskeva"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "Group Items By"
+msgstr "Ryhmittele kentän mukaan"
+
+#: ../e-util/e-table-config.ui.h:11
+msgid "Show _field in View"
+msgstr "Näytä _kenttä näkymässä"
+
+#: ../e-util/e-table-config.ui.h:12
+msgid "Then By"
+msgstr "sitten"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr "Näytä k_enttä näkymässä"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show field in _View"
+msgstr "Näytä kenttä _näkymässä"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Sort"
+msgstr "Järjestä"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Clear All"
+msgstr "Tyhjennä merkki"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Sort Items By"
+msgstr "Järjestä kentän mukaan"
+
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Valitse aikavyöhyke"
+
+#: ../e-util/e-timezone-dialog.ui.h:2
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Lähennä kartalla vasemmalla hiiren napilla haluamallesi alueelle ja valitse "
+"aikavyöhyke.\n"
+"Loitonna kartalla oikealla hiiren napilla."
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Aikavyöhykkeet"
+
+#: ../e-util/e-timezone-dialog.ui.h:5
+msgid "_Selection"
+msgstr "_Valinta"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Aikavyöhykkeen valinnan pudotusvalikko"
+
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
+#: ../mail/em-utils.c:240
+msgid "Incoming"
+msgstr "Tulevat"
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "tämänhetkinen aika"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "määrittelemäsi aika"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "Aika suhteessa tämänhetkiseen aikaan"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+msgid "seconds"
+msgstr "sekuntia"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "viikkoa"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "kuukautta"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "vuotta"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "sitten"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "tulevaisuudessa"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Sähköpostin näytön suodattimet:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+msgid "_Filter Rules"
+msgstr "_Suodatinsäännöt"
+
+#: ../e-util/filter.ui.h:17
+msgid "Compare against"
+msgstr "Vertaa arvoon"
+
+#: ../e-util/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Viestin päiväystä verrataan aikaan, jolloin\n"
+"suodatus tapahtuu."
+
+#: ../e-util/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Viestin päiväystä verrataan määritellyn päivän\n"
+" keskipäivään (klo 12:00)."
+
+#: ../e-util/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Viestin päiväystä verrataan suhteessa aikaan\n"
+"jolloin suodatus tapahtuu."
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "Luo uusi _näkymä"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
+#: ../mail/e-mail-config-summary-page.c:341
+msgid "_Name:"
+msgstr "_Nimi:"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Korvaa olemassaoleva näkymä"
+
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
+msgid "Cancel"
+msgstr "Peru"
+
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (peruttu)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (valmis)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (odottaa)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:258
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (perutaan)"
 
-#: ../e-util/e-activity.c:260
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
+#. Translators: Escape is a keyboard binding.
+#: ../e-util/e-alert-bar.c:121
+#| msgid "Close this message"
+msgid "Close this message (Escape)"
+msgstr "Sulje tämä viesti (Escape)"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Kuvakenäkymä"
+
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+msgid "List View"
+msgstr "Luettelonäkymä"
+
+#: ../e-util/e-attachment-dialog.c:318
+msgid "Attachment Properties"
+msgstr "Liitteen ominaisuudet"
+
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "_Tiedostonimi:"
+
+#: ../e-util/e-attachment-dialog.c:375
+msgid "MIME Type:"
+msgstr "MIME-tyyppi:"
+
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+msgid "_Suggest automatic display of attachment"
+msgstr "_Ehdota liitteen automaattista näyttämistä"
+
+#: ../e-util/e-attachment-handler-image.c:97
+msgid "Could not set as background"
+msgstr "Ei voitu asettaa taustakuvaksi"
+
+#: ../e-util/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Aseta _taustakuvaksi"
+
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
+msgid "Loading"
+msgstr "Ladataan"
+
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
+msgid "Saving"
+msgstr "Tallennetaan"
+
+#: ../e-util/e-attachment-paned.c:104
+msgid "Hide Attachment _Bar"
+msgstr "Piilota _liitepalkki"
+
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+msgid "Show Attachment _Bar"
+msgstr "Näytä _liitepalkki"
+
+#: ../e-util/e-attachment-store.c:463
+msgid "Add Attachment"
+msgstr "Lisää liite"
+
+#: ../e-util/e-attachment-store.c:466
+msgid "A_ttach"
+msgstr "Lii_tä"
+
+#: ../e-util/e-attachment-store.c:537
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Tallenna liite"
+msgstr[1] "Tallenna liitteet"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2048
+#: ../e-util/e-attachment.c:2708
+msgid "attachment.dat"
+msgstr "liite.dat"
+
+#: ../e-util/e-attachment-view.c:378
+msgid "Open With Other Application..."
+msgstr "Avaa tois_ella sovelluksella..."
+
+#: ../e-util/e-attachment-view.c:385
+msgid "S_ave All"
+msgstr "Tallenna _kaikki"
+
+#: ../e-util/e-attachment-view.c:411
+msgid "A_dd Attachment..."
+msgstr "_Lisää liite..."
+
+#: ../e-util/e-attachment-view.c:435
+msgid "_Hide"
+msgstr "_Piilota"
+
+#: ../e-util/e-attachment-view.c:442
+msgid "Hid_e All"
+msgstr "_Piilota kaikki"
+
+#: ../e-util/e-attachment-view.c:449
+msgid "_View Inline"
+msgstr "Näytä _sisäkkäisesti"
+
+#: ../e-util/e-attachment-view.c:456
+msgid "Vie_w All Inline"
+msgstr "_Näytä kaikki sisäkkäisesti"
+
+#: ../e-util/e-attachment-view.c:786
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Avaa sovelluksella \"%s\""
+
+#: ../e-util/e-attachment-view.c:789
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Avaa tämä liite ohjelmalla %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * 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.
+#: ../e-util/e-attachment.c:1103
+msgid "Attached message"
+msgstr "Liitetty viesti"
+
+#: ../e-util/e-attachment.c:2129 ../e-util/e-attachment.c:3014
+msgid "A load operation is already in progress"
+msgstr "Lataus on jo käynnissä"
+
+#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3022
+msgid "A save operation is already in progress"
+msgstr "Tallennus on jo käynnissä"
+
+#: ../e-util/e-attachment.c:2254
+#, c-format
+msgid "Could not load '%s'"
+msgstr "%s ei voitu ladata"
+
+#: ../e-util/e-attachment.c:2257
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Liitettä ei voitu avata"
+
+#: ../e-util/e-attachment.c:2561
+#, c-format
+msgid "Could not open '%s'"
+msgstr "%s ei voitu avata"
+
+#: ../e-util/e-attachment.c:2564
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Liitettä ei voitu avata"
+
+#: ../e-util/e-attachment.c:3031
+msgid "Attachment contents not loaded"
+msgstr "Liitteen sisältöä ei ladattu"
+
+#: ../e-util/e-attachment.c:3107
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
+
+#: ../e-util/e-attachment.c:3110
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Liitettä ei voitu tallentaa"
+
+#: ../e-util/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Merkitse oletusosoitekirjaksi"
+
+#: ../e-util/e-book-source-config.c:103
+#, fuzzy
+#| msgid "A_utocomplete with this address book"
+msgid "Autocomplete with this address book"
+msgstr "_Täydennä automaattisesti tästä osoitekirjasta"
+
+#: ../e-util/e-book-source-config.c:277
+#, fuzzy
+#| msgid "Copy _book content locally for offline operation"
+msgid "Copy book content locally for offline operation"
+msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../e-util/e-buffer-tagger.c:410
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl-napsauta avataksesi linkin"
+
+#: ../e-util/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Merkitse oletuskalenteriksi"
+
+#: ../e-util/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Merkitse oletustehtävälistaksi"
+
+#: ../e-util/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Merkitse oletusmuistiolistaksi"
+
+#: ../e-util/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Väri:"
+
+#: ../e-util/e-cal-source-config.c:406
+#, fuzzy
+#| msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "_Kopioi kalenterin sisältö paikallisesti yhteydettömään käyttöön"
+
+#: ../e-util/e-cal-source-config.c:410
+#, fuzzy
+#| msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy task list contents locally for offline operation"
+msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
+
+#: ../e-util/e-cal-source-config.c:414
+#, fuzzy
+#| msgid "Cop_y memo list contents locally for offline operation"
+msgid "Copy memo list contents locally for offline operation"
+msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+msgctxt "CalItem"
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1329
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1366
+#| msgid "%B %Y"
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../e-util/e-calendar.c:190
+msgid "Previous month"
+msgstr "Edellinen kuukausi"
+
+#: ../e-util/e-calendar.c:215
+msgid "Next month"
+msgstr "Seuraava kuukausi"
+
+#: ../e-util/e-calendar.c:241
+msgid "Previous year"
+msgstr "Edellinen vuosi"
+
+#: ../e-util/e-calendar.c:266
+msgid "Next year"
+msgstr "Seuraava vuosi"
+
+#: ../e-util/e-calendar.c:290
+msgid "Month Calendar"
+msgstr "Kuukausikalenteri"
+
+#: ../e-util/e-categories-editor.c:224
+msgid "Currently _used categories:"
+msgstr "Käytössä _olevat luokat:"
+
+#: ../e-util/e-categories-editor.c:235
+msgid "_Available Categories:"
+msgstr "_Käytettävissä olevat luokat:"
+
+#: ../e-util/e-categories-selector.c:323
+#| msgid "Icon View"
+msgid "Icon"
+msgstr "Kuvake"
+
+#: ../e-util/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Luo luokka \"%s\""
+
+#: ../e-util/e-category-editor.c:137
+#| msgid "Category"
+msgid "Category Icon"
+msgstr "Luokan kuvake"
+
+#: ../e-util/e-category-editor.c:141
+#| msgid "_No image"
+msgid "_No Image"
+msgstr "_Ei kuvaa"
+
+#: ../e-util/e-category-editor.c:178
+#| msgid "Category"
+msgid "Category _Name"
+msgstr "Luokan _nimi"
+
+#: ../e-util/e-category-editor.c:190
+#| msgid "Category"
+msgid "Category _Icon"
+msgstr "Luokan _kuvake"
+
+#: ../e-util/e-category-editor.c:216
+#| msgid "Calendar Properties"
+msgid "Category Properties"
+msgstr "Luokan ominaisuudet"
+
+#: ../e-util/e-category-editor.c:277
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "Asetuksista löytyy jo luokka nimeltä \"%s\". Valitse toinen nimi"
+
+#: ../e-util/e-cell-combo.c:186
+msgid "popup list"
+msgstr "ponnahduslista"
+
+#: ../e-util/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Nyt"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1900
+#: ../modules/itip-formatter/itip-view.c:230
+msgid "Today"
+msgstr "Tänään"
+
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:317
+msgctxt "table-date"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../e-util/e-cell-date-edit.c:325
+msgid "OK"
+msgstr "OK"
+
+#: ../e-util/e-cell-date-edit.c:873
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Ajan tulee olla muodossa: %s"
+
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
+
+#: ../e-util/e-charset-combo-box.c:100
+msgid "Character Encoding"
+msgstr "Merkistön koodaus"
+
+#: ../e-util/e-charset-combo-box.c:123
+msgid "Enter the character set to use"
+msgstr "Syötä käytettävä merkistö"
+
+#: ../e-util/e-charset-combo-box.c:342
+msgid "Other..."
+msgstr "Muut..."
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arabia"
@@ -9921,27 +10520,74 @@ msgstr "Ukrainalainen"
 msgid "Visual"
 msgstr "Visuaali"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
-#: ../modules/itip-formatter/itip-view.c:235
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Tänään"
+#: ../e-util/e-client-cache.c:1162
+#, c-format
+msgid "Cannot create a client object from extension name '%s'"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:524
+msgid "Date and Time"
+msgstr "Päiväys ja aika"
+
+#: ../e-util/e-dateedit.c:549
+msgid "Text entry to input date"
+msgstr "Tekstikenttä päiväyksen syöttöön"
+
+#: ../e-util/e-dateedit.c:572
+msgid "Click this button to show a calendar"
+msgstr "Paina tästä näyttääksesi kalenterin"
+
+#: ../e-util/e-dateedit.c:626
+msgid "Drop-down combination box to select time"
+msgstr "Yhdistelmävalitsin ajan valitsemiseen"
+
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Time"
+msgstr "Aika"
+
+#: ../e-util/e-dateedit.c:701
+msgid "No_w"
+msgstr "N_yt"
+
+#: ../e-util/e-dateedit.c:708
+msgid "_Today"
+msgstr "_Tänään"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:717
+msgid "_None"
+msgstr "_Ei mitään"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+msgctxt "date"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../e-util/e-dateedit.c:1953
+msgid "Invalid Date Value"
+msgstr "Virheellinen päivämäärä"
+
+#: ../e-util/e-dateedit.c:1998
+msgid "Invalid Time Value"
+msgstr "Virheellinen ajan kuvaus"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:222
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:230
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Seuraava ma"
@@ -9949,7 +10595,7 @@ msgstr "Seuraava ma"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:236
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Seuraava ti"
@@ -9957,7 +10603,7 @@ msgstr "Seuraava ti"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:242
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Seuraava ke"
@@ -9965,7 +10611,7 @@ msgstr "Seuraava ke"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:248
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Seuraava to"
@@ -9973,7 +10619,7 @@ msgstr "Seuraava to"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:254
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Seuraava pe"
@@ -9981,7 +10627,7 @@ msgstr "Seuraava pe"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:260
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Seuraava la"
@@ -9989,251 +10635,179 @@ msgstr "Seuraava la"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:266
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Seuraava su"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
 msgid "Use locale default"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:577
 msgid "Format:"
 msgstr "Muoto:"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Tuntematon tiedostonimi)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 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:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Kirjoitetaan tiedostoa ”%s” palvelimelle ”%s”"
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "Tapahtui virhe tulostettaessa"
-
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr "Tulostusjärjestelmä kertoi seuraavat yksityiskohdat virheestä:"
-
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
-
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
-msgstr "Tiedosto \"{0}\" on jo olemassa. Korvataanko se?"
-
-#: ../e-util/e-system.error.xml.h:2
-msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
-msgstr ""
-
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Korvaa"
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Tiedostoa \"{0}\" ei voi tallentaa."
-
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Syy: \"{1}\"."
-
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Tiedostoa \"{0}\" ei voi avata."
-
-#: ../e-util/e-system.error.xml.h:7
-#, fuzzy
-#| msgid "Could not read signature file &quot;{0}&quot;."
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
-
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-#, fuzzy
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "Virhe säännöllisessä lausekkeessa &quot;{0}&quot;."
-
-#: ../e-util/e-system.error.xml.h:9
-#, fuzzy
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
-
-#: ../e-util/e-system.error.xml.h:10
-#, fuzzy
-#| msgid "Bad regular expression &quot;{0}&quot;."
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Virhe säännöllisessä lausekkeessa &quot;{0}&quot;."
-
-#: ../e-util/e-util.c:249
-msgid "Could not open the link."
-msgstr "Linkkiä ei voitu avata."
-
-#: ../e-util/e-util.c:296
-msgid "Could not display help for Evolution."
-msgstr "Evolutionin ohjetta ei voitu näyttää."
-
 #. 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:69
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekunti tulevaisuudessa"
 msgstr[1] "%d sekuntia tulevaisuudessa"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:70
 #, 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
+#: ../e-util/e-filter-datespec.c:71
 #, 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:74
+#: ../e-util/e-filter-datespec.c:72
 #, 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:75
+#: ../e-util/e-filter-datespec.c:73
 #, 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:76
+#: ../e-util/e-filter-datespec.c:74
 #, 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:77
+#: ../e-util/e-filter-datespec.c:75
 #, 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:78
+#: ../e-util/e-filter-datespec.c:76
 #, 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:79
+#: ../e-util/e-filter-datespec.c:77
 #, 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:80
+#: ../e-util/e-filter-datespec.c:78
 #, 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:81
+#: ../e-util/e-filter-datespec.c:79
 #, 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:82
+#: ../e-util/e-filter-datespec.c:80
 #, 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:132
+#: ../e-util/e-filter-datespec.c:130
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi päiväys>"
 
-#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
-#: ../filter/e-filter-datespec.c:157
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
 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:142
+#: ../e-util/e-filter-datespec.c:140
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:291
+#: ../e-util/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../filter/e-filter-file.c:188
+#: ../e-util/e-filter-file.c:187
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../filter/e-filter-rule.c:744
+#: ../e-util/e-filter-rule.c:743
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../filter/e-filter-rule.c:794
-#, fuzzy
+#: ../e-util/e-filter-rule.c:793
 #| msgid "Find items that meet the following conditions"
 msgid "all the following conditions"
-msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
+msgstr "kaikkia seuraavia ehtoja"
 
-#: ../filter/e-filter-rule.c:795
-#, fuzzy
+#: ../e-util/e-filter-rule.c:794
 #| msgid "Find items that meet the following conditions"
 msgid "any of the following conditions"
-msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
+msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../filter/e-filter-rule.c:801
-#, fuzzy
+#: ../e-util/e-filter-rule.c:800
 #| msgid "_Find items:"
 msgid "_Find items which match:"
-msgstr "_Etsi kohteita:"
+msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../filter/e-filter-rule.c:824
+#: ../e-util/e-filter-rule.c:823
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -10241,172 +10815,1018 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:839 ../libemail-engine/camel-null-store.c:28
+#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
+#: ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
-#: ../widgets/misc/e-mail-signature-combo-box.c:369
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../filter/e-filter-rule.c:840
+#: ../e-util/e-filter-rule.c:839
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../filter/e-filter-rule.c:841 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "Vastaukset"
-
-#: ../filter/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:841
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/e-filter-rule.c:843
+#: ../e-util/e-filter-rule.c:842
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:845
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../filter/e-filter-rule.c:923
+#: ../e-util/e-filter-rule.c:922
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../filter/e-filter-rule.c:1240 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:302
-msgid "Incoming"
-msgstr "Tulevat"
-
-#: ../filter/e-filter-rule.c:1240 ../mail/em-utils.c:303
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: ../filter/e-rule-editor.c:288
+#: ../e-util/e-import-assistant.c:256
+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."
+
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "Tiedoston _tyyppi:"
+
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+msgid "Choose the destination for this import"
+msgstr "Valitse tämän tuonnin kohde"
+
+#: ../e-util/e-import-assistant.c:365
+msgid "Choose the type of importer to run:"
+msgstr "Valitse suoritettavan tuojan tyyppi:"
+
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
+
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr "Tuo _yksi tiedosto"
+
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+msgid "Please select the information that you would like to import:"
+msgstr "Valitse tieto jota haluaisit tuoda:"
+
+#: ../e-util/e-import-assistant.c:533
+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."
+
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#, c-format
+msgid "From %s:"
+msgstr "Ohjelmasta %s:"
+
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
+msgid "_Cancel Import"
+msgstr "_Peru tuonti"
+
+#: ../e-util/e-import-assistant.c:920
+msgid "Preview data to be imported"
+msgstr "Esikatsele tuotavia tietoja"
+
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
+msgid "Import Data"
+msgstr "Tuo tiedot"
+
+#: ../e-util/e-import-assistant.c:934
+msgid "Select what type of file you want to import from the list."
+msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
+
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+msgid "Evolution Import Assistant"
+msgstr "Evolutionin tuontiapulainen"
+
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+msgid "Import Location"
+msgstr "Tuo sijainti"
+
+#: ../e-util/e-import-assistant.c:1310
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Tervetuloa Evolutionin tuontiapulaiseen.\n"
+"Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
+"Evolutionin käyttöön."
+
+#: ../e-util/e-import-assistant.c:1327
+msgid "Importer Type"
+msgstr "Tuojan tyyppi"
+
+#: ../e-util/e-import-assistant.c:1337
+msgid "Select Information to Import"
+msgstr "Valitse tuotavat tiedot"
+
+#: ../e-util/e-import-assistant.c:1346
+msgid "Select a File"
+msgstr "Valitse tiedosto"
+
+#: ../e-util/e-import-assistant.c:1363
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
+
+#: ../e-util/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "Automaattisesti luotu"
+
+#: ../e-util/e-mail-signature-editor.c:310
+msgid "Close"
+msgstr "Sulje"
+
+#: ../e-util/e-mail-signature-editor.c:315
+msgid "_Save and Close"
+msgstr "_Tallenna ja sulje"
+
+#: ../e-util/e-mail-signature-editor.c:529
+msgid "Edit Signature"
+msgstr "Muokkaa allekirjoitusta"
+
+#: ../e-util/e-mail-signature-editor.c:549
+msgid "_Signature Name:"
+msgstr "Allekirjoituk_sen nimi:"
+
+#: ../e-util/e-mail-signature-editor.c:595
+msgid "Unnamed"
+msgstr "Nimeämätön"
+
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Lisää _skripti"
+
+#: ../e-util/e-mail-signature-manager.c:422
+msgid "Add Signature Script"
+msgstr "Lisää allekirjoitus-skripti"
+
+#: ../e-util/e-mail-signature-manager.c:492
+msgid "Edit Signature Script"
+msgstr "Muokkaa allekirjoitus-skriptiä"
+
+#: ../e-util/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"Tämän komennon tulostetta käytetään allekirjoituksenasi. \n"
+"Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
+"näytettäessä."
+
+#: ../e-util/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "_Skripti:"
+
+#: ../e-util/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "Skriptitiedoston tulee olla suoritettavissa."
+
+#: ../e-util/e-map.c:886
+msgid "World Map"
+msgstr "Maailmankartta"
+
+#: ../e-util/e-map.c:889
+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 alla olevasta pudotusvalikosta."
+
+#: ../e-util/e-misc-utils.c:242
+msgid "Could not open the link."
+msgstr "Linkkiä ei voitu avata."
+
+#: ../e-util/e-misc-utils.c:289
+msgid "Could not display help for Evolution."
+msgstr "Evolutionin ohjetta ei voitu näyttää."
+
+#: ../e-util/e-name-selector-dialog.c:279
+#| msgid "Contacts"
+msgid "Show Contacts"
+msgstr "Näytä yhteystiedot"
+
+#: ../e-util/e-name-selector-dialog.c:311
+#| msgid "Address Book"
+msgid "Address B_ook:"
+msgstr "_Osoitekirja:"
+
+#: ../e-util/e-name-selector-dialog.c:318
+#| msgid "Category"
+msgid "Cat_egory:"
+msgstr "_Luokka:"
+
+#: ../e-util/e-name-selector-dialog.c:342
+#| msgid "_Search"
+msgid "_Search:"
+msgstr "Et_si:"
+
+#: ../e-util/e-name-selector-dialog.c:368
+#: ../e-util/e-name-selector-dialog.c:1276
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
+msgid "Any Category"
+msgstr "Mikä tahansa luokka"
+
+#: ../e-util/e-name-selector-dialog.c:370
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "_Yhteystiedot"
+
+#: ../e-util/e-name-selector-dialog.c:447
+#| msgid "_Search"
+msgid "Search"
+msgstr "Etsi"
+
+#: ../e-util/e-name-selector-dialog.c:450
+#: ../mail/importers/pine-importer.c:426
+msgid "Address Book"
+msgstr "Osoitekirja"
+
+#: ../e-util/e-name-selector-dialog.c:453
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../e-util/e-name-selector-dialog.c:578
+#| msgid "Select Address Book"
+msgid "Select Contacts from Address Book"
+msgstr "Valitse yhteystiedot osoitekirjasta"
+
+#: ../e-util/e-name-selector-dialog.c:1001
+msgid "_Remove"
+msgstr "_Poista"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3028
+#, fuzzy, c-format
+msgid "E_xpand %s Inline"
+msgstr "_Laajenna kaikki"
+
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3044
+#, c-format
+msgid "Cop_y %s"
+msgstr "_Kopioi %s"
+
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3055
+#, c-format
+msgid "C_ut %s"
+msgstr "_Leikkaa %s"
+
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3073
+#, c-format
+#| msgid "_Edit"
+msgid "_Edit %s"
+msgstr "_Muokkaa %s"
+
+#: ../e-util/e-name-selector-list.c:583
+#, c-format
+#| msgid "_Delete"
+msgid "_Delete %s"
+msgstr "_Poista %s"
+
+#: ../e-util/e-online-button.c:31
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
+
+#: ../e-util/e-online-button.c:34
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
+
+#: ../e-util/e-online-button.c:37
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
+
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
+msgstr ""
+
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr "Caps Lock -näppäin on päällä."
+
+#: ../e-util/e-passwords.c:578
+#| msgid "_Remember password"
+msgid "_Remember this passphrase"
+msgstr "_Muista salalause"
+
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr ""
+
+#: ../e-util/e-passwords.c:584
+#| msgid "_Remember password"
+msgid "_Remember this password"
+msgstr "_Muista salasana"
+
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Evolutionin asetukset"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Tapahtui virhe tulostettaessa"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "Tulostusjärjestelmä kertoi seuraavat yksityiskohdat virheestä:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
+
+#: ../e-util/e-rule-editor.c:185
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../filter/e-rule-editor.c:395
+#: ../e-util/e-rule-editor.c:287
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../filter/filter.error.xml.h:1
+#: ../e-util/e-search-bar.c:81
+#, c-format
+msgid "Matches: %u"
+msgstr "Osumia: %u"
+
+#: ../e-util/e-search-bar.c:565
+msgid "Close the find bar"
+msgstr "Sulje hakupalkki"
+
+#: ../e-util/e-search-bar.c:573
+msgid "Fin_d:"
+msgstr "Et_si:"
+
+#: ../e-util/e-search-bar.c:585
+msgid "Clear the search"
+msgstr "Tyhjennä hakukenttä"
+
+#: ../e-util/e-search-bar.c:609
+msgid "_Previous"
+msgstr "_Edellinen"
+
+#: ../e-util/e-search-bar.c:615
+msgid "Find the previous occurrence of the phrase"
+msgstr "Etsi lauseen edellinen esiintymä"
+
+#: ../e-util/e-search-bar.c:624
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../e-util/e-search-bar.c:630
+msgid "Find the next occurrence of the phrase"
+msgstr "Etsi lauseen seuraava esiintymä"
+
+#: ../e-util/e-search-bar.c:639
+msgid "Mat_ch case"
+msgstr "Huomioi _kirjainkoko"
+
+#: ../e-util/e-search-bar.c:667
+msgid "Reached bottom of page, continued from top"
+msgstr "Saavutettiin sivun loppu, jatketaan alusta"
+
+#: ../e-util/e-search-bar.c:689
+msgid "Reached top of page, continued from bottom"
+msgstr "Saavutettiin sivun alku, jatketaan lopusta"
+
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
+#: ../mail/importers/pine-importer.c:419
+#: ../modules/mail/e-mail-shell-view.c:1075
+msgid "Mail"
+msgstr "Sähköposti"
+
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr "Milloin _poistettu:"
+
+#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+msgid "Name:"
+msgstr "Nimi:"
+
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1302
+msgid "Refresh every"
+msgstr "Päivitysväli"
+
+#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+msgid "Use a secure connection"
+msgstr "Käytä salattua yhteyttä:"
+
+#: ../e-util/e-source-config.c:1428
+#, fuzzy
+#| msgid "Imported Certificate"
+msgid "Unset _trust for SSL certificate"
+msgstr "Tuotu varmenne"
+
+#: ../e-util/e-source-config.c:1464
+msgid "User"
+msgstr "Käyttäjä"
+
+#: ../e-util/e-source-selector-dialog.c:229
+#| msgid "_Destination folder:"
+msgid "_Destination"
+msgstr "_Kohde"
+
+#: ../e-util/e-source-selector-dialog.c:342
+#| msgid "Select destination file"
+msgid "Select destination"
+msgstr "Valitse kohde"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:384
+msgid "(no suggestions)"
+msgstr "(ei ehdotuksia)"
+
+#: ../e-util/e-spell-entry.c:408
+msgid "More..."
+msgstr "Lisää..."
+
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:479
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "Lisää \"%s\" sanastoon"
+
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:530
+#, fuzzy
+#| msgid "Ignore"
+msgid "Ignore All"
+msgstr "Älä välitä"
+
+#: ../e-util/e-spell-entry.c:558
+msgid "Spelling Suggestions"
+msgstr "Kirjoitusehdotukset"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "Tiedosto \"{0}\" on jo olemassa. Korvataanko se?"
+
+#: ../e-util/e-system.error.xml.h:2
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+"Tiedosto on jo olemassa kohteessa \"{0}\". Uusi tiedosto korvaa vanhan "
+"sisällön."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Korvaa"
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Tiedostoa \"{0}\" ei voi tallentaa."
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Syy: \"{1}\"."
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Tiedostoa \"{0}\" ei voi avata."
+
+#: ../e-util/e-system.error.xml.h:7
+#, fuzzy
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "Ilmoitettu virhe oli &quot;{1}&quot;."
+
+#: ../e-util/e-system.error.xml.h:9
+#, fuzzy
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
+
+#: ../e-util/e-system.error.xml.h:10
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "Resurssin &quot;{0}&quot; poistaminen epäonnistui."
+
+#: ../e-util/e-system.error.xml.h:11
+#, fuzzy
+#| msgid "The Evolution address book has quit unexpectedly."
+msgid ""
+"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
+
+#: ../e-util/e-system.error.xml.h:12
+#| msgid ""
+#| "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Some of your contacts may not be available until Evolution is restarted."
+msgstr ""
+"Joitain yhteystietoja ei välttämättä voi käyttää, ennen kuin Evolution on "
+"käynnistetty uudelleen."
+
+#: ../e-util/e-system.error.xml.h:13
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "Evolutionin kalenteri sulkeutui odottamatta."
+
+#: ../e-util/e-system.error.xml.h:14
+#, fuzzy
+#| msgid "Your memos will not be available until Evolution is restarted."
+msgid ""
+"Some of your appointments may not be available until Evolution is restarted."
+msgstr ""
+"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
+"uudestaan."
+
+#: ../e-util/e-system.error.xml.h:15
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "Evolutionin kalenteri sulkeutui odottamatta."
+
+#: ../e-util/e-system.error.xml.h:16
+#, fuzzy
+#| msgid "Your memos will not be available until Evolution is restarted."
+msgid "Some of your memos may not be available until Evolution is restarted."
+msgstr ""
+"Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
+"uudestaan."
+
+#: ../e-util/e-system.error.xml.h:17
+#, fuzzy
+#| msgid "The Evolution calendar has quit unexpectedly."
+msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "Evolutionin kalenteri sulkeutui odottamatta."
+
+#: ../e-util/e-system.error.xml.h:18
+#, fuzzy
+#| msgid "Your tasks will not be available until Evolution is restarted."
+msgid "Some of your tasks may not be available until Evolution is restarted."
+msgstr ""
+"Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
+"uudestaan."
+
+#: ../e-util/e-system.error.xml.h:19
+msgid ""
+"The address book backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:20
+msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:21
+msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:22
+msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+msgid "click to add"
+msgstr "lisää napsauttamalla"
+
+#: ../e-util/e-table-column-selector.c:266
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected column names to top"
+msgstr "Siirrä valitut viestit toiseen kansioon"
+
+#: ../e-util/e-table-column-selector.c:271
+#, fuzzy
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names up one row"
+msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
+
+#: ../e-util/e-table-column-selector.c:276
+#, fuzzy
+#| msgid "Move selected contacts to another address book"
+msgid "Move selected column names down one row"
+msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
+
+#: ../e-util/e-table-column-selector.c:281
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected column names to bottom"
+msgstr "Siirrä valitut viestit toiseen kansioon"
+
+#: ../e-util/e-table-column-selector.c:286
+#| msgid "Select all visible memos"
+msgid "Select all column names"
+msgstr "Valitse kaikki sarakenimet"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+msgid "(Ascending)"
+msgstr "(nouseva)"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+msgid "(Descending)"
+msgstr "(laskeva)"
+
+#: ../e-util/e-table-config.c:396
+msgid "Not sorted"
+msgstr "Ei järjestetty"
+
+#: ../e-util/e-table-config.c:441
+msgid "No grouping"
+msgstr "Ei ryhmitystä"
+
+#: ../e-util/e-table-config.c:546
+msgid "Show Fields"
+msgstr "Näytä kentät"
+
+#: ../e-util/e-table-config.c:562
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose the order of information to appear in the message list."
+msgstr "Valitse kansio johon viesti postitetaan:"
+
+#: ../e-util/e-table-field-chooser-dialog.c:227
+msgid "Add a Column"
+msgstr "Lisää sarake"
+
+#: ../e-util/e-table-field-chooser.c:167
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
+"johon haluat sen ilmestyvän."
+
+#: ../e-util/e-table-group-container.c:369
+#, 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)"
+
+#: ../e-util/e-table-group-container.c:383
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d kohta)"
+msgstr[1] "%s (%d kohtaa)"
+
+#: ../e-util/e-table-header-item.c:1576
+msgid "Customize Current View"
+msgstr "Muokkaa nykyistä näkymää"
+
+#: ../e-util/e-table-header-item.c:1599
+msgid "Sort _Ascending"
+msgstr "järjestä _nousevasti"
+
+#: ../e-util/e-table-header-item.c:1602
+msgid "Sort _Descending"
+msgstr "Järjestä _laskevasti"
+
+#: ../e-util/e-table-header-item.c:1605
+msgid "_Unsort"
+msgstr "Poista _järjestys"
+
+#: ../e-util/e-table-header-item.c:1608
+msgid "Group By This _Field"
+msgstr "Ryhmittele tämän _kentän mukaan"
+
+#: ../e-util/e-table-header-item.c:1611
+msgid "Group By _Box"
+msgstr "Ryhmittele _laatikoittain"
+
+#: ../e-util/e-table-header-item.c:1615
+msgid "Remove This _Column"
+msgstr "Poista tämä sa_rake"
+
+#: ../e-util/e-table-header-item.c:1618
+msgid "Add a C_olumn..."
+msgstr "Lisää _sarake..."
+
+#: ../e-util/e-table-header-item.c:1622
+msgid "A_lignment"
+msgstr "_Tasaus"
+
+#: ../e-util/e-table-header-item.c:1625
+msgid "B_est Fit"
+msgstr "_Paras sovitus"
+
+#: ../e-util/e-table-header-item.c:1628
+msgid "Format Column_s..."
+msgstr "Muotoile _sarakkeet..."
+
+#: ../e-util/e-table-header-item.c:1632
+msgid "Custo_mize Current View..."
+msgstr "_Mukauta nykyistä näkymää..."
+
+#: ../e-util/e-table-header-item.c:1703
+msgid "_Sort By"
+msgstr "_Järjestystapa"
+
+#. Custom
+#: ../e-util/e-table-header-item.c:1726
+msgid "_Custom"
+msgstr "_Oma"
+
+#: ../e-util/e-text.c:2098
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: ../e-util/e-text.c:2111
+msgid "Input Methods"
+msgstr "Syötemenetelmät"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:803
+msgid "UTC"
+msgstr "UTC"
+
+#: ../e-util/e-url-entry.c:109
+#| msgid "Click here to go to URL"
+msgid "Click here to open the URL"
+msgstr "Napsauta tästä avataksesi verkko-osoitteen"
+
+#: ../e-util/e-url-entry.c:111
+#| msgid "Enter Passphrase"
+msgid "Enter a URL here"
+msgstr "Kirjoita verkko-osoite tähän"
+
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+msgid "_Copy Link Location"
+msgstr "_Kopioi linkin sijainti"
+
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+msgid "Copy the link to the clipboard"
+msgstr "Kopioi linkki leikepöydälle"
+
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
+msgid "_Open Link in Browser"
+msgstr "_Avaa linkki selaimessa"
+
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+msgid "Open the link in a web browser"
+msgstr "Avaa linkki selaimessa"
+
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
+msgid "_Copy Email Address"
+msgstr "_Kopioi sähköpostiosoite"
+
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
+msgid "_Copy Image"
+msgstr "K_opioi kuva"
+
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+msgid "Copy the image to the clipboard"
+msgstr "Kopioi kuva leikepöydälle"
+
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1261
+msgid "Select all text and images"
+msgstr "Valitse kaikki teksti ja kuvat"
+
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:936
+#: ../e-util/e-web-view.c:938 ../e-util/e-web-view.c:940
+#, c-format
+msgid "Click to call %s"
+msgstr "Soita numeroon %s napsauttamalla"
+
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:942
+msgid "Click to hide/unhide addresses"
+msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
+
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:944
+#, c-format
+msgid "Click to open %s"
+msgstr "Napsauta avataksesi %s"
+
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "Tal_lenna kuva..."
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "Tallenna kuva tiedostoon"
+
+#: ../e-util/e-web-view.c:2834
+#| msgid "Copy the image to the clipboard"
+msgid "Copying image to clipboard"
+msgstr "Kopioidaan kuva leikepöydälle"
+
+#: ../e-util/e-web-view.c:3022
+msgid "Save Image"
+msgstr "Tallenna kuva"
+
+#: ../e-util/e-web-view.c:3058
+#, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Saving image to '%s'"
+msgstr "Tallennetaan kuva kohteeseen \"%s\""
+
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+msgid "%d %B %Y"
+msgstr "%e. %Bta %Y"
+
+#: ../e-util/ea-calendar-item.c:327
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalenteri väliltä %s - %s"
+
+#: ../e-util/ea-calendar-item.c:364
+msgid "evolution calendar item"
+msgstr "evolutionin kalenterin kohta"
+
+#: ../e-util/evolution-source-viewer.c:635
+#, fuzzy
+#| msgid "Evolution Pine importer"
+msgid "Evolution Source Viewer"
+msgstr "Evolutionin Pine-tuoja"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:665
+#, fuzzy
+#| msgid "Display"
+msgid "Display Name"
+msgstr "Näytä"
+
+#: ../e-util/evolution-source-viewer.c:674
+#, fuzzy
+#| msgid "_Flag:"
+msgid "Flags"
+msgstr "_Merkki:"
+
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:677
+msgid "Identity"
+msgstr "Omat tiedot"
+
+#: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Päiväys puuttuu."
 
-#: ../filter/filter.error.xml.h:2
+#: ../e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "Unohdit valita päivän."
 
-#: ../filter/filter.error.xml.h:3
+#: ../e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:4
+#: ../e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "Tiedostonimi täytyy antaa."
 
-#: ../filter/filter.error.xml.h:5
+#: ../e-util/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr ""
 "Tiedostoa &quot;{0}&quot; ei ole olemassa tai se ei ole tavallinen tiedosto."
 
-#: ../filter/filter.error.xml.h:6
+#: ../e-util/filter.error.xml.h:6
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Virhe säännöllisessä lausekkeessa &quot;{0}&quot;."
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/filter.error.xml.h:7
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Säännöllistä lauseketta &quot;{1}&quot; ei voi kääntää."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
-#: ../filter/filter.error.xml.h:9
+#: ../e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "Suodattimella täytyy olla nimi."
 
-#: ../filter/filter.error.xml.h:10
+#: ../e-util/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "Nimi &quot;{0}&quot; on jo käytössä."
 
-#: ../filter/filter.error.xml.h:11
+#: ../e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Valitse toinen nimi."
 
-#: ../filter/filter.ui.h:2
-msgid "the current time"
-msgstr "tämänhetkinen aika"
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:128
+msgid "popup a child"
+msgstr "Ponnauta lapsi"
 
-#: ../filter/filter.ui.h:3
-msgid "the time you specify"
-msgstr "määrittelemäsi aika"
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
+msgid "toggle the cell"
+msgstr "Vaihtele solun näkyvyyttä"
 
-#: ../filter/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "Aika suhteessa tämänhetkiseen aikaan"
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:215
+msgid "expands the row in the ETree containing this cell"
+msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
 
-#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
-msgid "seconds"
-msgstr "sekuntia"
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:223
+msgid "collapses the row in the ETree containing this cell"
+msgstr "piilota tämän solun sisältävä ETreen rivi"
 
-#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "viikkoa"
+#: ../e-util/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Taulukon solu"
 
-#: ../filter/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "kuukautta"
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "napsauta"
 
-#: ../filter/filter.ui.h:11
-msgid "years"
-msgstr "vuotta"
+#: ../e-util/gal-a11y-e-table-column-header.c:163
+msgid "sort"
+msgstr "järjestä"
 
-#: ../filter/filter.ui.h:12
-msgid "ago"
-msgstr "sitten"
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
+msgid "Save Current View"
+msgstr "Tallenna nykyinen näkymä"
 
-#: ../filter/filter.ui.h:13
-msgid "in the future"
-msgstr "tulevaisuudessa"
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Haluatko tallentaa muutokset?"
 
-#: ../filter/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Sähköpostin näytön suodattimet:"
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
-msgid "_Filter Rules"
-msgstr "_Suodatinsäännöt"
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Hylkää muutokset"
 
-#: ../filter/filter.ui.h:17
-msgid "Compare against"
-msgstr "Vertaa arvoon"
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Tyhjä allekirjoitus"
 
-#: ../filter/filter.ui.h:18
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Viestin päiväystä verrataan aikaan, jolloin\n"
-"suodatus tapahtuu."
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
-#: ../filter/filter.ui.h:20
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Viestin päiväystä verrataan määritellyn päivän\n"
-" keskipäivään (klo 12:00)."
+#: ../e-util/widgets.error.xml.h:6
+#| msgid "Copy the image to the clipboard"
+msgid "Unable to copy image to clipboard."
+msgstr "Kuvan kopioiminen leikepödälle ei onnistu."
 
-#: ../filter/filter.ui.h:22
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
+#: ../e-util/widgets.error.xml.h:7
+#| msgid "Unable to save {0}."
+msgid "Unable to save image."
+msgstr "Kuvan tallennus ei onnistu."
+
+#: ../e-util/widgets.error.xml.h:8
+msgid "Could not load signature."
+msgstr "Allekirjoitusta ei voi ladata."
+
+#: ../e-util/widgets.error.xml.h:9
+msgid "Could not save signature."
+msgstr "Allekirjoitusta ei voi tallentaa."
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#| msgid "OAuth"
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:28
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
-"Viestin päiväystä verrataan suhteessa aikaan\n"
-"jolloin suodatus tapahtuu."
 
 #: ../libemail-engine/e-mail-authenticator.c:182
 #, fuzzy, c-format
@@ -10419,104 +11839,135 @@ msgstr "Virheellinen tunnistautuminen"
 msgid "Saving message to folder '%s'"
 msgstr "Tallennetaan viestiä kansioon ”%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:566
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../libemail-engine/e-mail-folder-utils.c:676
-#: ../libemail-engine/e-mail-folder-utils.c:927
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:770
-#, fuzzy
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
-msgstr "Tallennetaan viestiä kansioon"
+msgstr "Etsitään kaksoiskappaleita viesteistä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1178
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Poistetaan kansiota ”%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1315
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Tiedosto \"%s\" on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1319
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 msgid "File has been removed."
 msgstr "Tiedosto on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1378
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 msgid "Removing attachments"
 msgstr "Poistetaan liitteitä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1542
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:613
+#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:638
 #, fuzzy, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Virheellinen kansio: ”%s”"
 
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1034
-#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../libemail-engine/e-mail-session-utils.c:540
+#, fuzzy
+#| msgid "No HTML stream available"
+msgid "No mail transport service available"
+msgstr "HTML-virtaa ei ole saatavilla"
+
+#: ../libemail-engine/e-mail-session-utils.c:640
+#: ../libemail-engine/mail-ops.c:730
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:689
+#: ../libemail-engine/mail-ops.c:774
+#, 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."
+
+#: ../libemail-engine/e-mail-session-utils.c:715
+#: ../libemail-engine/mail-ops.c:798
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:916
+#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+msgid "Sending message"
+msgstr "Lähetetään viestiä"
+
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
+#: ../mail/em-folder-tree-model.c:786
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
-#: ../plugins/templates/templates.c:1355
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1347
 #, c-format
-#| msgid "User canceled operation."
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../libemail-engine/e-mail-session.c:1489
-#, fuzzy, c-format
+#: ../libemail-engine/e-mail-session.c:1542
+#, c-format
 msgid "%s authentication failed"
-msgstr "Todennus epäonnistui"
+msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../libemail-engine/e-mail-session.c:1534
+#: ../libemail-engine/e-mail-session.c:1592
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:1585
+#: ../libemail-engine/e-mail-session.c:1655
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been "
@@ -10526,66 +11977,28 @@ msgid ""
 "cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-session.c:1598
+#: ../libemail-engine/e-mail-session.c:1668
 #, fuzzy, c-format
 #| msgid "No account found to use, forward of the message has been cancelled."
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Käytettävää tiliä ei löydy, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr ""
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr ""
-
-#: ../libemail-engine/e-mail-session-utils.c:641
-#: ../libemail-engine/mail-ops.c:700
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:670
-#: ../libemail-engine/e-mail-session-utils.c:704
-#: ../libemail-engine/mail-ops.c:717 ../libemail-engine/mail-ops.c:753
-#, 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."
-
-#: ../libemail-engine/e-mail-session-utils.c:724
-#: ../libemail-engine/mail-ops.c:775
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:954
-#: ../libemail-engine/mail-ops.c:907 ../libemail-engine/mail-ops.c:1009
-msgid "Sending message"
-msgstr "Lähetetään viestiä"
-
-#: ../libemail-engine/e-mail-store-utils.c:171
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Katkaistaan yhteys kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:263
+#: ../libemail-engine/e-mail-store-utils.c:279
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:340
+#: ../libemail-engine/e-mail-store-utils.c:370
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 
-#: ../libemail-engine/mail-folder-cache.c:876
+#: ../libemail-engine/mail-folder-cache.c:1241
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
@@ -10594,56 +12007,76 @@ msgstr "Pingataan %s"
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../libemail-engine/mail-ops.c:216
-msgid "Fetching Mail"
-msgstr "Noudetaan viestejä"
+#: ../libemail-engine/mail-ops.c:152
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:233
+#, c-format
+#| msgid "Fetching Mail"
+msgid "Fetching mail from '%s'"
+msgstr "Noudetaan viestejä kohteesta '%s'"
 
-#: ../libemail-engine/mail-ops.c:918
+#: ../libemail-engine/mail-ops.c:724
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:940
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../libemail-engine/mail-ops.c:970
-#, fuzzy, c-format
+#: ../libemail-engine/mail-ops.c:992
+#, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
-msgstr[0] "%d viestin %d:stä lähetys epäonnistui"
+msgstr[0] "Viestin lähetys epäonnistui"
 msgstr[1] "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../libemail-engine/mail-ops.c:976
+#: ../libemail-engine/mail-ops.c:998
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../libemail-engine/mail-ops.c:978
+#: ../libemail-engine/mail-ops.c:1000
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1112
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1091
+#: ../libemail-engine/mail-ops.c:1113
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1232
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../libemail-engine/mail-ops.c:1283
+#: ../libemail-engine/mail-ops.c:1360
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1361
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1358
+#: ../libemail-engine/mail-ops.c:1435
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria ”%s”"
@@ -10658,31 +12091,31 @@ msgstr ""
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:229
+#: ../libemail-engine/mail-tools.c:237
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../libemail-engine/mail-tools.c:231
+#: ../libemail-engine/mail-tools.c:239
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../libemail-engine/mail-vfolder.c:130
+#: ../libemail-engine/mail-vfolder.c:153
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Määritellään hakunäkymää: %s"
 
-#: ../libemail-engine/mail-vfolder.c:283
-#, fuzzy, c-format
+#: ../libemail-engine/mail-vfolder.c:306
+#, c-format
 msgid "Updating Search Folders for '%s' - %s"
-msgstr "Päivitetään hakunäkymää \"%s\""
+msgstr "Päivitetään hakukansioita - '%s' - %s"
 
 #. 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.
-#: ../libemail-engine/mail-vfolder.c:648
+#: ../libemail-engine/mail-vfolder.c:670
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10700,22 +12133,33 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
 
-#: ../mail/e-mail-account-manager.c:460
+#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+#| msgid "All Accounts"
+msgid "Open _Online Accounts"
+msgstr "Avaa _verkkotilit"
+
+#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+msgid "This account was created through the Online Accounts service."
+msgstr "Tämä tili luotiin verkkotilipalvelun kautta."
+
+#: ../mail/e-mail-account-manager.c:690
 msgid "_Restore Default"
 msgstr "_Palauta oletus"
 
-#: ../mail/e-mail-account-manager.c:473
+#: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
+"Voit vetää ja tippuuttaa tilinimiä määrittääksesi niiden järjestyksen "
+"uudelleen."
 
-#: ../mail/e-mail-account-manager.c:518
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "_Oletustili"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:864
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:890
 msgid "Enabled"
 msgstr "käytössä"
 
@@ -10723,68 +12167,48 @@ msgstr "käytössä"
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-account-tree-view.c:136
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
-#: ../mail/mail-config.ui.h:44
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
+#: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/e-mail-autoconfig.c:194
-#, c-format
-msgid "No mail exchanger record for '%s'"
-msgstr ""
-
-#: ../mail/e-mail-autoconfig.c:201
-#, c-format
-msgid "Temporarily unable to resolve '%s'"
-msgstr ""
-
-#: ../mail/e-mail-autoconfig.c:208
-#, fuzzy, c-format
-#| msgid "Error removing list"
-msgid "Error resolving '%s'"
-msgstr "Virhe poistettaessa listaa"
-
-#: ../mail/e-mail-autoconfig.c:264
-#, c-format
-msgid "No authoritative name server for '%s'"
-msgstr ""
-
-#: ../mail/e-mail-autoconfig.c:661
-#, fuzzy
+#: ../mail/e-mail-autoconfig.c:578
 msgid "No email address provided"
-msgstr "Salasanasi on vanhentunut."
+msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../mail/e-mail-autoconfig.c:670
-#, fuzzy
+#: ../mail/e-mail-autoconfig.c:587
 #| msgid "Using email address"
 msgid "Missing domain in email address"
-msgstr "Käytetään sähköpostiosoitetta"
+msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
 #: ../mail/e-mail-backend.c:737
 msgid "Unknown background operation"
 msgstr "Tuntematon taustatoiminto"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../mail/e-mail-browser.c:284
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
-#: ../mail/e-mail-config-assistant.c:501
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:102
+msgid "_Skip Lookup"
+msgstr "_Ohita haku"
+
+#: ../mail/e-mail-config-assistant.c:562
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../mail/e-mail-config-auth-check.c:348
-#, fuzzy
+#: ../mail/e-mail-config-auth-check.c:352
 #| msgid "Ch_eck for Supported Types"
 msgid "Check for Supported Types"
-msgstr "Tar_kista tuetut tyypit"
+msgstr "Tarkista tuetut tyypit"
 
 #: ../mail/e-mail-config-confirm-page.c:157
 msgid ""
@@ -10804,92 +12228,92 @@ msgstr ""
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:552
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: ../mail/e-mail-config-defaults-page.c:558
-#| msgid "Sent _Messages Folder:"
+#: ../mail/e-mail-config-defaults-page.c:561
 msgid "Draft Messages _Folder:"
 msgstr "Luonnosviestin _kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
-#, fuzzy
+#: ../mail/e-mail-config-defaults-page.c:571
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for saving draft messages."
-msgstr "Valitse kansio johon viesti postitetaan:"
+msgstr "Valitse tallennuskansio luonnosviesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:585
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:592
-#, fuzzy
+#: ../mail/e-mail-config-defaults-page.c:595
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for saving sent messages."
-msgstr "Valitse kansio johon viesti postitetaan:"
+msgstr "Valitse tallennuskansio lähetetyille viesteille."
+
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:631
 msgid "_Restore Defaults"
 msgstr "_Palauta oletukset"
 
-#: ../mail/e-mail-config-defaults-page.c:625
+#: ../mail/e-mail-config-defaults-page.c:645
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:626
-#, fuzzy
+#: ../mail/e-mail-config-defaults-page.c:646
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for deleted messages."
-msgstr "Valitse kansio johon viesti postitetaan:"
+msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:635
+#: ../mail/e-mail-config-defaults-page.c:655
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:636
+#: ../mail/e-mail-config-defaults-page.c:656
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for junk messages."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:673
 msgid "Composing Messages"
 msgstr "Viestien kirjoittaminen"
 
-#: ../mail/e-mail-config-defaults-page.c:662
+#: ../mail/e-mail-config-defaults-page.c:682
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:687
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:722
+#: ../mail/e-mail-config-defaults-page.c:742
 msgid "Message Receipts"
 msgstr "Viestin kuittaukset"
 
-#: ../mail/e-mail-config-defaults-page.c:731
+#: ../mail/e-mail-config-defaults-page.c:751
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/e-mail-config-defaults-page.c:756
+#: ../mail/e-mail-config-defaults-page.c:776
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/e-mail-config-defaults-page.c:762
+#: ../mail/e-mail-config-defaults-page.c:782
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/e-mail-config-defaults-page.c:768
+#: ../mail/e-mail-config-defaults-page.c:788
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/e-mail-config-defaults-page.c:839
+#: ../mail/e-mail-config-defaults-page.c:859
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
-#: ../mail/e-mail-config-identity-page.c:254
+#: ../mail/e-mail-config-identity-page.c:266
 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 "
@@ -10899,14 +12323,13 @@ 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/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:294
 #: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-identity-page.c:303
 #: ../mail/e-mail-config-summary-page.c:333
-#, fuzzy
 #| msgid ""
 #| "Type the name by which you would like to refer to this account.\n"
 #| "For example: \"Work\" or \"Personal\""
@@ -10915,56 +12338,42 @@ msgid ""
 "For example, \"Work\" or \"Personal\"."
 msgstr ""
 "Anna nimi, jolla haluat kutsua tätä sähköpostitiliä.\n"
-"Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
+"Esimerkiksi \"Työ\" tai \"Henkilökohtainen\""
 
-#: ../mail/e-mail-config-identity-page.c:299
-#: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-mail-signature-script-dialog.c:417
-msgid "_Name:"
-msgstr "_Nimi:"
-
-#: ../mail/e-mail-config-identity-page.c:336
+#: ../mail/e-mail-config-identity-page.c:348
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:345
+#: ../mail/e-mail-config-identity-page.c:357
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:384
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/e-mail-config-identity-page.c:409
+#: ../mail/e-mail-config-identity-page.c:431
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:417
+#: ../mail/e-mail-config-identity-page.c:439
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/e-mail-config-identity-page.c:444
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/e-mail-config-identity-page.c:499
+#: ../mail/e-mail-config-identity-page.c:521
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "Omat tiedot"
-
 #: ../mail/e-mail-config-lookup-page.c:68
-#, fuzzy
 msgid "Looking up account details..."
-msgstr "Ladataan..."
+msgstr "Etsitään tilin tietoja..."
 
 #: ../mail/e-mail-config-provider-page.c:485
-#| msgid "Checking for new mail"
 msgid "Checking for New Mail"
 msgstr "Tarkistetaan uusia viestejä"
 
@@ -10981,11 +12390,12 @@ msgid "Receiving Email"
 msgstr "Vastaanotto"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Yleiset"
 
@@ -10994,12 +12404,10 @@ msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
 #: ../mail/e-mail-config-security-page.c:290
-#| msgid "Pretty Good Privacy (PGP/GPG)"
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP) -salaus"
 
 #: ../mail/e-mail-config-security-page.c:298
-#| msgid "PGP/GPG _Key ID:"
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP_-avaimen ID:"
 
@@ -11008,22 +12416,22 @@ msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
 #: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -11049,7 +12457,6 @@ msgstr "_Allekirjoitusvarmenne:"
 
 #: ../mail/e-mail-config-security-page.c:441
 #: ../mail/e-mail-config-security-page.c:547
-#| msgid "Select..."
 msgid "Select"
 msgstr "Valitse"
 
@@ -11058,21 +12465,18 @@ msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
 #: ../mail/e-mail-config-security-page.c:500
-#, fuzzy
 #| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always 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ä tiliä"
 
 #: ../mail/e-mail-config-security-page.c:523
-#| msgid "Encry_ption certificate:"
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
 #: ../mail/e-mail-config-security-page.c:565
-#, fuzzy
 #| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always encrypt outgoing messages when using this account"
-msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
+msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
 
 #: ../mail/e-mail-config-security-page.c:585
 #, fuzzy
@@ -11100,19 +12504,18 @@ msgstr "TLS"
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
+"Alla on yhteenveto asetuksista, joiden avulla otetaan yhteys "
+"sähköpostitiliisi."
 
 #: ../mail/e-mail-config-summary-page.c:372
-#| msgid "Personal Details:"
 msgid "Personal Details"
 msgstr "Henkilökohtaiset tiedot"
 
 #: ../mail/e-mail-config-summary-page.c:381
-#| msgid "Full Nam_e:"
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
 #: ../mail/e-mail-config-summary-page.c:395
-#| msgid "Email _Address:"
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
@@ -11125,19 +12528,16 @@ msgid "Sending"
 msgstr "Lähetys"
 
 #: ../mail/e-mail-config-summary-page.c:433
-#| msgid "Server _Type:"
 msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
 #: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:610
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
-#| msgid "_Server:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Server:"
 msgstr "Palvelin:"
 
 #: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
@@ -11160,48 +12560,38 @@ msgstr ""
 "Aloita napsauttamalla \"Jatka\"."
 
 #: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:150
+#: ../modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../mail/e-mail-config-window.c:329
+#: ../mail/e-mail-config-window.c:327
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:96
 msgid "_Add to Address Book..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:103
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:110
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/e-mail-display.c:140
-#, fuzzy
+#: ../mail/e-mail-display.c:117
 msgid "Send _Reply To..."
-msgstr "_Lähetä..."
+msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../mail/e-mail-display.c:142
-#, fuzzy
+#: ../mail/e-mail-display.c:119
 msgid "Send a reply message to this address"
-msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
+msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:149
+#: ../mail/e-mail-display.c:126
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
-#: ../mail/e-mail-display.c:159
-msgid "Save _Image..."
-msgstr "Tal_lenna kuva..."
-
-#: ../mail/e-mail-display.c:161
-msgid "Save the image to a file"
-msgstr "Tallenna kuva tiedostoon"
-
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -11212,32 +12602,32 @@ msgstr ""
 msgid "_Label name:"
 msgstr "_Otsakkeen nimi:"
 
-#: ../mail/e-mail-label-list-store.c:49
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "Tärk_eä"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:50
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Työ"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:51
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Henkilökohtainen"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:52
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "Te_htävää"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:53
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Myöhemmin"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:718
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
@@ -11257,686 +12647,645 @@ msgstr ""
 msgid "Color"
 msgstr "Väri"
 
-#: ../mail/e-mail-migrate.c:332
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "Ei voida luoda paikallisia sähköpostikansioita kohteeseen ”%s”: %s"
+#: ../mail/e-mail-print-config-headers.c:167
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers to top"
+msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "Valitse kansio"
+#: ../mail/e-mail-print-config-headers.c:172
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers up one row"
+msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-printer.c:124
-#, c-format
-msgid "Page %d of %d"
-msgstr "Sivu  %d / %d"
+#: ../mail/e-mail-print-config-headers.c:177
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers down one row"
+msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-printer.c:549
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-msgid "Print"
-msgstr "Tulosta"
+#: ../mail/e-mail-print-config-headers.c:182
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected headers to bottom"
+msgstr "Siirrä valitut viestit toiseen kansioon"
+
+#: ../mail/e-mail-print-config-headers.c:187
+#| msgid "Select all text"
+msgid "Select all headers"
+msgstr "Valitse kaikki otsakkeet"
 
-#: ../mail/e-mail-printer.c:555
+#: ../mail/e-mail-print-config-headers.c:206
 msgid "Header Name"
 msgstr "Otsakkeen nimi"
 
-#: ../mail/e-mail-printer.c:561
+#: ../mail/e-mail-print-config-headers.c:215
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/e-mail-reader.c:350
-msgid "Save Image"
-msgstr "Tallenna kuva"
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "Sivu  %d / %d"
 
-#: ../mail/e-mail-reader.c:432 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:432 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:966 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/e-mail-reader.c:966 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../mail/e-mail-reader.c:1314 ../mail/e-mail-reader.c:1496
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1424
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../mail/e-mail-reader.c:1542
+#: ../mail/e-mail-reader.c:1430
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1632
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../mail/e-mail-reader.c:1778 ../mail/e-mail-reader.c:2868
+#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Noudetaan viestiä ”%s”"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1860
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1862
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1867
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:1869
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1874
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1876
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1881
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1883
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:1983
-#, fuzzy
+#: ../mail/e-mail-reader.c:1888
 #| msgid "Filter on Mailing _List..."
 msgid "Create a Filter Rule for Mailing _List..."
-msgstr "Suodata postitus_listan mukaan..."
+msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1890
 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:1990
-#, fuzzy
+#: ../mail/e-mail-reader.c:1895
 #| msgid "Filter on _Recipients..."
 msgid "Create a Filter Rule for _Recipients..."
-msgstr "Suodata _vastaanottajien mukaan..."
+msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:1897
 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:1997
-#, fuzzy
+#: ../mail/e-mail-reader.c:1902
 #| msgid "Filter on Se_nder..."
 msgid "Create a Filter Rule for Se_nder..."
-msgstr "Suodata _lähettäjän mukaan..."
+msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:1904
 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:2004
-#, fuzzy
+#: ../mail/e-mail-reader.c:1909
 #| msgid "Filter on _Subject..."
 msgid "Create a Filter Rule for _Subject..."
-msgstr "Suodata _aiheen mukaan..."
+msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:1911
 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:2011
+#: ../mail/e-mail-reader.c:1916
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:1918
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1923
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:1925
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1930
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:1932
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1937
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:1939
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:1944
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:1946
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:1951
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:1958
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:1965
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
 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:2067
+#: ../mail/e-mail-reader.c:1972
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1979
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:1986
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:1993
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:1995
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2000
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2007
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2014
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2021
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2028
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2035
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2037
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2042
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2044
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2049
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2051
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2056
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2058
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2063
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2065
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:2165
-msgid "_Switch to Folder"
-msgstr "_Vaihda kansioon"
-
-#: ../mail/e-mail-reader.c:2167
-msgid "Display the parent folder"
-msgstr "Näytä ylemmän tason kansio"
-
-#: ../mail/e-mail-reader.c:2172
-msgid "Switch to _next tab"
-msgstr "Siirry _seuraavaan välilehteen"
-
-#: ../mail/e-mail-reader.c:2174
-msgid "Switch to the next tab"
-msgstr "Siirry seuraavaan välilehteen"
-
-#: ../mail/e-mail-reader.c:2179
-msgid "Switch to _previous tab"
-msgstr "Siirry _edelliseen välilehteen"
-
-#: ../mail/e-mail-reader.c:2181
-msgid "Switch to the previous tab"
-msgstr "Siirry edelliseen välilehteen"
-
-#: ../mail/e-mail-reader.c:2186
-msgid "Cl_ose current tab"
-msgstr "_Sulje nykyinen välilehti"
-
-#: ../mail/e-mail-reader.c:2188
-msgid "Close current tab"
-msgstr "Sulje nykyinen välilehti"
-
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2070
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2072
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2077
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2202
+#: ../mail/e-mail-reader.c:2079
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2084
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2086
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2091
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2098
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2105
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2235
-#, fuzzy
+#: ../mail/e-mail-reader.c:2112
 msgid "Previous T_hread"
-msgstr "_Edellinen viesti"
+msgstr "_Edellinen säie"
 
-#: ../mail/e-mail-reader.c:2237
-#, fuzzy
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the previous thread"
-msgstr "Näytä edellinen viesti"
+msgstr "Näytä edellinen säie"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2119
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2128
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2135
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2140
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2142
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2147
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2149
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../mail/e-mail-reader.c:2277
-#, fuzzy
+#: ../mail/e-mail-reader.c:2154
 msgid "Remove Du_plicate Messages"
-msgstr "Piilota _valitut viestit"
+msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../mail/e-mail-reader.c:2279
-#, fuzzy
+#: ../mail/e-mail-reader.c:2156
 msgid "Checks selected messages for duplicates"
-msgstr "Merkitse valitut viestit poistettaviksi"
+msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../mail/e-mail-reader.c:2284 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:160
+#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2163
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:2291 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2170
 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:2298
-#: ../modules/mail/e-mail-attachment-handler.c:167
+#: ../mail/e-mail-reader.c:2175
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../mail/e-mail-reader.c:2177
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2182
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2184
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2189
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2191
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2203
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../mail/e-mail-reader.c:2205
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2210
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:2335
+#: ../mail/e-mail-reader.c:2212
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../mail/e-mail-reader.c:2342
+#: ../mail/e-mail-reader.c:2219
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2224
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../mail/e-mail-reader.c:2226
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2233
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2240
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2247
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2254
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2261
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2268
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:2398
+#: ../mail/e-mail-reader.c:2275
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../mail/e-mail-reader.c:2282
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:2415
-#, fuzzy
+#: ../mail/e-mail-reader.c:2292
 #| msgid "Search Folder from Mailing _List..."
 msgid "Create a Search Folder from Mailing _List..."
-msgstr "Hakunäkymä _postilistasta..."
+msgstr "Luo hakukansio _postilistasta..."
 
-#: ../mail/e-mail-reader.c:2417
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../mail/e-mail-reader.c:2422
-#, fuzzy
+#: ../mail/e-mail-reader.c:2299
 #| msgid "Search Folder from Recipien_ts..."
 msgid "Create a Search Folder from Recipien_ts..."
-msgstr "Hakunäkymä _vastaanottajista..."
+msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:2424
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../mail/e-mail-reader.c:2429
-#, fuzzy
+#: ../mail/e-mail-reader.c:2306
 #| msgid "Search Folder from Sen_der..."
 msgid "Create a Search Folder from Sen_der..."
-msgstr "Hakunäkymä _lähettäjästä..."
+msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../mail/e-mail-reader.c:2436
-#, fuzzy
+#: ../mail/e-mail-reader.c:2313
 #| msgid "Search Folder from S_ubject..."
 msgid "Create a Search Folder from S_ubject..."
-msgstr "Hakunäkymä _aiheesta..."
+msgstr "Luo hakukansio _aiheesta..."
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2338
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../mail/e-mail-reader.c:2469
+#: ../mail/e-mail-reader.c:2346
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/e-mail-reader.c:2473
+#: ../mail/e-mail-reader.c:2350
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2477
+#: ../mail/e-mail-reader.c:2354
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2481
+#: ../mail/e-mail-reader.c:2358
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:2485
+#: ../mail/e-mail-reader.c:2362
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2366
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:2533
+#: ../mail/e-mail-reader.c:2410
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2412
 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:2541
+#: ../mail/e-mail-reader.c:2418
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:2543
+#: ../mail/e-mail-reader.c:2420
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:2874
-#| msgid "Retrieving %d message"
-#| msgid_plural "Retrieving %d messages"
+#: ../mail/e-mail-reader.c:2780
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../mail/e-mail-reader.c:3854
-#: ../modules/mail/e-mail-attachment-handler.c:153
+#: ../mail/e-mail-reader.c:3702
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:3855
+#: ../mail/e-mail-reader.c:3703
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:3874
+#: ../mail/e-mail-reader.c:3722
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:3875
+#: ../mail/e-mail-reader.c:3723
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:3941 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:3974
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../mail/e-mail-reader.c:3801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:3978
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../mail/e-mail-reader.c:3805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:3987 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/e-mail-reader.c:4705
-#, c-format
-msgid "Folder '%s'"
-msgstr "Kansio ”%s”"
-
-#: ../mail/e-mail-reader-utils.c:154
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
 
-#: ../mail/e-mail-reader-utils.c:954
+#: ../mail/e-mail-reader-utils.c:976
 #, fuzzy
 #| msgid "Print"
 msgid "Printing"
@@ -11944,7 +13293,7 @@ msgstr "Tulosta"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1136
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11953,9 +13302,13 @@ msgid_plural ""
 "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 msgstr[0] ""
+"Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
+"sen?"
 msgstr[1] ""
+"Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
+"sen?"
 
-#: ../mail/e-mail-reader-utils.c:1544
+#: ../mail/e-mail-reader-utils.c:2026
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -11966,26 +13319,24 @@ msgstr[1] "Tallenna viestit"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1565
+#: ../mail/e-mail-reader-utils.c:2047
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../mail/e-mail-reader-utils.c:2020
+#: ../mail/e-mail-reader-utils.c:2416
 #, fuzzy
 #| msgid "Saving %d message"
 #| msgid_plural "Saving %d messages"
 msgid "Parsing message"
 msgstr "Tallennetaan %d viesti"
 
-#: ../mail/e-mail-request.c:152
-#, fuzzy, c-format
-#| msgid "Failed to load the calendar '%s' (%s)"
-msgid "Failed to load part '%s'"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+#: ../mail/e-mail-request.c:182
+msgid "The message has no text content."
+msgstr "Viestissä ei ole tekstisisältöä."
 
-#: ../mail/e-mail-tag-editor.c:293
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
@@ -11993,7 +13344,7 @@ msgstr "Merkitse edelleenlähetettäväksi"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1282
+#: ../mail/em-composer-utils.c:1372
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12001,27 +13352,27 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:1288
+#: ../mail/em-composer-utils.c:1378
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1383
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-composer-utils.c:2573
+#: ../mail/em-composer-utils.c:2528
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../mail/em-composer-utils.c:2991
+#: ../mail/em-composer-utils.c:2949
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:2992
+#: ../mail/em-composer-utils.c:2950
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/em-filter-editor-folder-element.c:158
+#: ../mail/em-filter-editor-folder-element.c:157
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
@@ -12031,252 +13382,256 @@ msgid "Adjust Score"
 msgstr "Muuta pisteytystä"
 
 #: ../mail/em-filter-i18n.h:3
+#| msgid "IMAP Headers"
+msgid "Any header"
+msgstr "Mikä tahansa otsake"
+
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Color"
 msgstr "Aseta väri"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:5
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
 msgid "Beep"
 msgstr "Piippaa"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:9
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:10
 msgid "Completed On"
 msgstr "Valmistui"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:13
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:14
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:16
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:18
 msgid "does not end with"
 msgstr "ei pääty"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:19
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:20
 msgid "does not have words"
 msgstr "ei sisällä sanoja"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not return"
 msgstr "ei palauta"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not sound like"
 msgstr "ei kuulosta samalta kuin"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:23
 msgid "does not start with"
 msgstr "ei ala"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:26
 msgid "ends with"
 msgstr "päättyy"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "exists"
 msgstr "on olemassa"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Expression"
 msgstr "Lauseke"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
 msgid "Forward to"
 msgstr "Välitä"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "has words"
 msgstr "sisältää sanat"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "Important"
 msgstr "Tärkeä"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:35
 msgid "is after"
 msgstr "on jälkeen"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:36
 msgid "is before"
 msgstr "on ennen"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:37
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:41
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "is not set"
 msgstr "ei ole asetettu"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:43
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Label"
 msgstr "Merkintä"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Match All"
 msgstr "Kaikki käyvät"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:52
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:53
 msgid "Message Location"
 msgstr "Viestin sijainti"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:55
 msgid "Pipe to Program"
 msgstr "Välitä putkessa ohjelmalle"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:56
 msgid "Play Sound"
 msgstr "Soita ääni"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Luettu"
 
-#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:59
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:60
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:61
 msgid "returns"
 msgstr "palauttaa"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:62
 msgid "returns greater than"
 msgstr "palauttaa enemmän kuin"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:63
 msgid "returns less than"
 msgstr "palauttaa vähemmän kuin"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:64
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:67
 msgid "Sender or Recipients"
 msgstr "Lähettäjä tai vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Label"
 msgstr "Aseta merkintä"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:69
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:70
 msgid "Size (kB)"
 msgstr "Koko (kB)"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:71
 msgid "sounds like"
 msgstr "kuulostaa samalta kuin"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:72
 msgid "Source Account"
 msgstr "Lähteen yhteystieto"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:73
 msgid "Specific header"
 msgstr "Annettu otsake"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:74
 msgid "starts with"
 msgstr "alkaa"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:76
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:78
-#, fuzzy
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Color"
-msgstr "Valitsematon sarake"
+msgstr "Poista värin asetus"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:80
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
@@ -12311,7 +13666,7 @@ msgstr "Levytilan käyttö (%s):"
 msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
-#: ../mail/em-folder-properties.c:338
+#: ../mail/em-folder-properties.c:347
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
@@ -12327,152 +13682,151 @@ msgstr "_Luo"
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:637
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
-#: ../mail/em-folder-tree.c:780
+#: ../mail/em-folder-tree.c:774
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1605
+#: ../mail/em-folder-tree.c:1599
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
+#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2165
+#: ../mail/em-folder-tree.c:2201
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
+#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1165
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:518
 msgid "Move Folder To"
 msgstr "Siirrä kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:518
 msgid "Copy Folder To"
 msgstr "Kopioi kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:615
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:616
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-subscription-editor.c:869
+#: ../mail/em-subscription-editor.c:867
 msgid "_Subscribe"
 msgstr "_Tilaa"
 
-#: ../mail/em-subscription-editor.c:878
+#: ../mail/em-subscription-editor.c:876
 #, fuzzy
 msgid "Su_bscribe To Shown"
 msgstr "_Tilaa lista"
 
-#: ../mail/em-subscription-editor.c:886
+#: ../mail/em-subscription-editor.c:884
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../mail/em-subscription-editor.c:995
+#: ../mail/em-subscription-editor.c:990
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../mail/em-subscription-editor.c:1003
+#: ../mail/em-subscription-editor.c:998
 msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
-#: ../mail/em-subscription-editor.c:1682
+#: ../mail/em-subscription-editor.c:1677
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/em-subscription-editor.c:1722
+#: ../mail/em-subscription-editor.c:1716
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../mail/em-subscription-editor.c:1737
+#: ../mail/em-subscription-editor.c:1729
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../mail/em-subscription-editor.c:1755
-#, fuzzy
+#: ../mail/em-subscription-editor.c:1746
 msgid "Sho_w items that contain:"
-msgstr "_Näytä vain kohteet, jotka sisältävät:"
+msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../mail/em-subscription-editor.c:1800
+#: ../mail/em-subscription-editor.c:1789
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1790
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../mail/em-subscription-editor.c:1846
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../mail/em-subscription-editor.c:1886
+#: ../mail/em-subscription-editor.c:1875
 #, fuzzy
 msgid "Collapse all folders"
 msgstr "Pienennä _kaikki"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1876
 #, fuzzy
 msgid "C_ollapse All"
 msgstr "Pienennä _kaikki"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1886
 #, fuzzy
 msgid "Expand all folders"
 msgstr "_Laajenna kaikki"
 
-#: ../mail/em-subscription-editor.c:1898
+#: ../mail/em-subscription-editor.c:1887
 #, fuzzy
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../mail/em-subscription-editor.c:1908
+#: ../mail/em-subscription-editor.c:1897
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../mail/em-subscription-editor.c:1920
+#: ../mail/em-subscription-editor.c:1909
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
@@ -12480,23 +13834,23 @@ msgstr "Keskeytä nykyinen operaatio"
 #. * 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
+#: ../mail/em-utils.c:86
 #, 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:162
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:1067
+#: ../mail/em-utils.c:982
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
@@ -12505,90 +13859,83 @@ msgstr "Viestit %s:ltä"
 msgid "Search _Folders"
 msgstr "_Hakunäkymät"
 
-#: ../mail/em-vfolder-editor-rule.c:391
+#: ../mail/em-vfolder-editor-rule.c:397
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
-#: ../mail/em-vfolder-editor-rule.c:517
+#: ../mail/em-vfolder-editor-rule.c:523
 msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:549
+#: ../mail/em-vfolder-editor-rule.c:555
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:561
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:569
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:570
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:602
-#| msgid "Enable search folders"
+#: ../mail/em-vfolder-editor-rule.c:608
 msgid "include subfolders"
 msgstr "sisällytä alikansiot"
 
-#: ../mail/importers/elm-importer.c:179
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1074
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "Sähköposti"
-
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:378
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-tuoja"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:379
 msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:255
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:256
+#: ../plugins/pst-import/pst-importer.c:545
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../mail/importers/evolution-mbox-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:257
+#: ../plugins/pst-import/pst-importer.c:546
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:439
+#: ../mail/importers/evolution-mbox-importer.c:437
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../mail/importers/evolution-mbox-importer.c:444
+#: ../mail/importers/evolution-mbox-importer.c:442
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
-#: ../shell/e-shell-utils.c:195
+#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../shell/e-shell-utils.c:172
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:489
+#: ../mail/importers/evolution-mbox-importer.c:487
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
@@ -12598,8 +13945,8 @@ msgstr "Tuodaan kansiota"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:784
+#: ../plugins/dbx-import/dbx-importer.c:612
+#: ../plugins/pst-import/pst-importer.c:764
 #, c-format
 msgid "Importing '%s'"
 msgstr "Tuodaan ”%s”"
@@ -12609,43 +13956,39 @@ msgstr "Tuodaan ”%s”"
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../mail/importers/pine-importer.c:251
+#: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "Osoitekirja"
-
-#: ../mail/importers/pine-importer.c:478
+#: ../mail/importers/pine-importer.c:474
 msgid "Evolution Pine importer"
 msgstr "Evolutionin Pine-tuoja"
 
-#: ../mail/importers/pine-importer.c:479
+#: ../mail/importers/pine-importer.c:475
 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:229 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:255
+#: ../mail/mail-autofilter.c:252
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:406
+#: ../mail/mail-autofilter.c:403
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
@@ -12654,7 +13997,7 @@ msgstr "Lisää suodatussääntö"
 #. * 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:513
+#: ../mail/mail-autofilter.c:512
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12732,7 +14075,6 @@ msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
 #: ../mail/mail-config.ui.h:15
-#, fuzzy
 msgid "_Keep signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
@@ -12749,20 +14091,53 @@ msgstr "Ryhmävastaus menee vain sähköpostilistalle, jos mahdollista"
 #: ../mail/mail-config.ui.h:18
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
+"Allekirjoita viestit _digitaalisesti alkuperäisen viestin ollessa "
+"allekirjoitettu (PGP tai S/MIME)"
+
+#: ../mail/mail-config.ui.h:19
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Liite"
 
 #: ../mail/mail-config.ui.h:20
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Sisennetty (Outlookin tapaan)"
+
+#: ../mail/mail-config.ui.h:21
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Lainattu"
+
+#: ../mail/mail-config.ui.h:22
+#| msgctxt "ReplyForward"
+#| msgid "Do not quote"
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Älä lainaa"
+
+#: ../mail/mail-config.ui.h:23
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "Sisennettynä"
+
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "A_llekirjoitukset"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "_Kielet"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:28
+msgid "Languages Table"
+msgstr "Kielitaulukko"
+
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12770,61 +14145,53 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.ui.h:24
-msgid "Languages Table"
-msgstr "Kielitaulukko"
-
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
+"Välttääksesi vahinkoja ja noloja tilanteita, kysy vahvistus ennen "
+"seuraavissa tilanteissa etenemistä:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
-#, fuzzy
+#: ../mail/mail-config.ui.h:37
 msgid "Sending a message with an _empty subject line"
-msgstr "_Kysy vahvistus lähetettäessä viestejä tyhjällä Aihe-otsakkeella"
+msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
-#, fuzzy
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with only _Bcc recipients defined"
-msgstr ""
-"Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
+msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
-#, fuzzy
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
-msgstr ""
-"Kysy vahvistus lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
+msgstr "Lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
-#, fuzzy
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a reply to a large _number of recipients"
-msgstr "Lähetetäänkö vastaus kaikille vastaanottajille?"
+msgstr "Lähettäessä vastausta suurelle määrälle _vastaanottajia"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:45
 #, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
@@ -12832,54 +14199,24 @@ msgstr ""
 "listalle"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
-#, fuzzy
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
-"Seuraavia vastaanottajia ei tunnistettu kelvollisiksi "
-"sähköpostiosoitteiksi:\n"
-"{0}"
+"Lähettäessä viestiä vastaanottajille, _joita ei ole kirjoitettu "
+"sähköpostiosoitteen muodossa"
 
-#: ../mail/mail-config.ui.h:43
-#, fuzzy
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
-msgstr "Asetukset"
+msgstr "Vahvistukset"
 
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Liite"
-
-#: ../mail/mail-config.ui.h:52
-#, fuzzy
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Sisäkkäinen alkuperäisviesti (Outlookin tapaan)"
-
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Lainattu"
-
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "Älä lainaa"
-
-#: ../mail/mail-config.ui.h:55
-#, fuzzy
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "Sisäkkäisesti"
-
 #: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "Välityspalvelimen asetukset"
@@ -12913,7 +14250,7 @@ msgid "No _Proxy for:"
 msgstr "Ei _välipalvelinta seuraaville:"
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
 msgid "Port:"
 msgstr "Portti:"
 
@@ -12966,7 +14303,6 @@ msgid "Fix_ed Width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
 #: ../mail/mail-config.ui.h:77
-#| msgid "Mark Me_ssages as Read"
 msgid "_Mark messages as read after"
 msgstr "Merkitse vie_stit luetuiksi viiveellä"
 
@@ -12995,8 +14331,9 @@ msgid "Delete Mail"
 msgstr "Sähköpostien poistaminen"
 
 #: ../mail/mail-config.ui.h:85
-msgid "Empty trash folders on e_xit"
-msgstr "Tyhj_ennä roskakorit lopetettaessa"
+#| msgid "Empty trash folders on e_xit"
+msgid "Empty _trash folders"
+msgstr "Tyhj_ennä roskakorikansiot"
 
 #: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
@@ -13044,59 +14381,57 @@ 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:98
-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:99
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:99
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:90
+#: ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:102
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../mail/mail-config.ui.h:104
-msgid "Delete junk messages on e_xit"
+#: ../mail/mail-config.ui.h:103
+#, fuzzy
+#| msgid "Delete junk messages on e_xit"
+msgid "_Delete junk messages"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:104
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:105
 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"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:106
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:107
 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:110 ../modules/addressbook/ldap-config.ui.h:3
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
+#: ../mail/mail-config.ui.h:109
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:111
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -13381,7 +14716,7 @@ msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1518
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -13503,9 +14838,8 @@ msgid ""
 msgstr "Jos poistat kansion, kaikki sen sisältö menetetään pysyvästi."
 
 #: ../mail/mail.error.xml.h:69
-#, fuzzy
 msgid "These messages are not copies."
-msgstr "Tekstin viestiosan kokoraja"
+msgstr "Nämä viestit eivät ole kopioita."
 
 #: ../mail/mail.error.xml.h:70
 #, fuzzy
@@ -13531,12 +14865,14 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
 #: ../mail/mail.error.xml.h:74
-msgid "Cannot open source \"{2}\"."
-msgstr "Lähdettä \"{2}\" ei voi avata."
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot open source folder. Error: {2}"
+msgstr "Lähdekansiota ei voi avata. Virhe: {2}"
 
 #: ../mail/mail.error.xml.h:75
-msgid "Cannot open target \"{2}\"."
-msgstr "Kohdetta \"{2}\" ei voi avata."
+#| msgid "Cannot open target \"{2}\"."
+msgid "Cannot open target folder. Error: {2}"
+msgstr "Kohdekansiota ei voi avata. Virhe: {2}"
 
 #: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -13547,8 +14883,9 @@ msgid "Cannot create folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi luoda."
 
 #: ../mail/mail.error.xml.h:78
-msgid "Cannot open source \"{1}\"."
-msgstr "Lähdettä \"{1}\" ei voi avata."
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot open folder. Error: {1}"
+msgstr "Kansiota ei voi avata. Virhe: {1}"
 
 #: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
@@ -13598,7 +14935,7 @@ msgid "Do _Not Disable"
 msgstr "_Älä poista käytöstä"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:626
+#: ../plugins/publish-calendar/publish-calendar.c:649
 msgid "_Disable"
 msgstr "Älä _käytä"
 
@@ -13643,8 +14980,9 @@ msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
 #: ../mail/mail.error.xml.h:102
-msgid "No sources selected."
-msgstr "Lähteitä ei ole valittuna."
+#| msgid "No sources selected."
+msgid "No folder selected."
+msgstr "Kansiota ei ole valittu."
 
 #: ../mail/mail.error.xml.h:103
 msgid ""
@@ -13728,10 +15066,9 @@ msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
 #: ../mail/mail.error.xml.h:122
-#, fuzzy
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
-msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
+msgstr "Tuettujen tunnistautumistapojen kysely palvelimelta epäonnistui."
 
 #: ../mail/mail.error.xml.h:123
 msgid "Synchronize folders locally for offline usage?"
@@ -13762,36 +15099,39 @@ 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:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Tämä toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
-"alikansioissa luetuiksi."
+msgid "Also mark messages in subfolders?"
+msgstr "Merkitse viestit myös alikansioissa?"
 
 #: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "Sulje viesti-ikkuna."
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
+"kaikissa sen alikansioissa?"
 
 #: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "Haluatko sulkea viesti-ikkunan?"
+msgid "In Current Folder and _Subfolders"
+msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
 #: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "_Kyllä"
+msgid "In Current _Folder Only"
+msgstr "Vain nykyisessä _kansiossa"
 
 #: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "_Ei"
+msgid "Should Evolution close this window when replying or forwarding?"
+msgstr ""
+"Pitäisikö Evolutionin sulkea tämä ikkuna vastatessa tai lähettäessä edelleen?"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "_Aina"
+#| msgid "_Always"
+msgid "_Yes, Always"
+msgstr "_Kyllä, aina"
 
 #: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "E_i koskaan"
+#| msgid "Never"
+msgid "_No, Never"
+msgstr "Ei, ei koskaan"
 
 #: ../mail/mail.error.xml.h:136
 #, fuzzy
@@ -13800,22 +15140,36 @@ msgid "Copy folder in folder tree."
 msgstr "Kopioidaan kansiota %s"
 
 #: ../mail/mail.error.xml.h:137
-#| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Haluatko varmasti kopioida kansion '{0}' kansioon '{1}'?"
 
 #: ../mail/mail.error.xml.h:138
+msgid "_Yes"
+msgstr "_Kyllä"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_No"
+msgstr "_Ei"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Always"
+msgstr "_Aina"
+
+#: ../mail/mail.error.xml.h:141
+msgid "N_ever"
+msgstr "E_i koskaan"
+
+#: ../mail/mail.error.xml.h:142
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Move folder in folder tree."
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/mail.error.xml.h:139
-#| msgid "Are you sure you want to delete the '{0}' task?"
+#: ../mail/mail.error.xml.h:143
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Haluatko varmasti siirtää kansion '{0}' kansioon '{1}'?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13823,239 +15177,243 @@ msgstr ""
 "Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:145
 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:142
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 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:144
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "”Etsi roskapostia” epäonnistui"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "”Ilmoita roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "”Ilmoita ei-roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:147
-#, fuzzy
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
-msgstr "Poistetaanko valtuutus %s?"
+msgstr "Poistetaanko viestien kaksoiskappaleet?"
 
-#: ../mail/mail.error.xml.h:148
-#, fuzzy
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
-msgstr "Viimeistelemätön viesti löytyi"
+msgstr "Kaksoiskappaleita ei löytynyt."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
-#, fuzzy
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "Liite ei sisällä kelvollista kalenteriviestiä"
+msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 #, fuzzy
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "Viestin nouto ei onnistunut."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "Kansion avaus epäonnistui."
 
-#: ../mail/mail.error.xml.h:157
-#, fuzzy
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
-msgstr "%d viestin %d:stä lähetys epäonnistui"
+msgstr "VIestin kaksoiskappaleiden etsiminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
+#| msgid "Failed to save messages to disk."
+msgid "Failed to mark messages as read."
+msgstr "Viestien merkitseminen luetuiksi epäonnistui."
+
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "Liitteiden poisto viesteistä epäonnistui."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 #, fuzzy
 msgid "Failed to download messages for offline viewing."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "Viestien tallennus levylle epäonnistui."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:167
 msgid "Hidden file is attached."
-msgstr ""
+msgstr "Piilotiedosto on liitetty."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:168
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr ""
+"Liite nimeltä {0} on piilotiedosto, ja se saattaa sisältää arkaluontoista "
+"tietoa. Varmista tiedoston sisältö ennen lähettämistä."
 
-#: ../mail/mail.error.xml.h:164
-#| msgid "Print this calendar"
+#: ../mail/mail.error.xml.h:169
 msgid "Printing failed."
 msgstr "Tulostus epäonnistui."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:170
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Tulostimen vastaus: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:171
 #, fuzzy
 #| msgid "Could not open destination"
 msgid "Could not perform this operation on {0}."
 msgstr "Kohdetta ei voi avata"
 
-#: ../mail/mail-send-recv.c:203
+#: ../mail/mail.error.xml.h:172
+msgid "You must be working online to complete this operation."
+msgstr ""
+"Verkkoyhteyden tulee olla muodostettu, jotta tämä toimenpide on mahdollista "
+"suorittaa."
+
+#: ../mail/mail-send-recv.c:202
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:547
+#: ../mail/mail-send-recv.c:546
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:563
+#: ../mail/mail-send-recv.c:562
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
 #: ../mail/mail-send-recv.c:1020
-#, c-format
-msgid "Checking for new mail"
+#, fuzzy, c-format
+#| msgid "Checking for new mail"
+msgid "Checking for new mail at '%s'"
 msgstr "Tarkistetaan onko uusia viestejä"
 
-#: ../mail/mail-vfolder-ui.c:79
+#: ../mail/mail-vfolder-ui.c:78
 msgid "Search Folders"
 msgstr "Hakunäkymät"
 
-#: ../mail/mail-vfolder-ui.c:159
+#: ../mail/mail-vfolder-ui.c:158
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder-ui.c:280
+#: ../mail/mail-vfolder-ui.c:279
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../mail/message-list.c:1262
+#: ../mail/message-list.c:298
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1263
+#: ../mail/message-list.c:299
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1264
+#: ../mail/message-list.c:300
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1265
+#: ../mail/message-list.c:301
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:1266
+#: ../mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1267
+#: ../mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1271
+#: ../mail/message-list.c:316
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:317
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:321
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:322
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
+#: ../mail/message-list.c:466 ../mail/message-list.c:5717
+msgid "Generating message list"
+msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1916
+#: ../mail/message-list.c:1867
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1928
+#: ../mail/message-list.c:1879
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1936
+#: ../mail/message-list.c:1887
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1938
+#: ../mail/message-list.c:1889
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2769
+#: ../mail/message-list.c:2767
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Viestit"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4132
+#: ../mail/message-list.c:4762
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
-msgid "Generating message list"
-msgstr "Luodaan viestiluetteloa"
-
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:5655
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -14063,7 +15421,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:4873
+#: ../mail/message-list.c:5663
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -14088,8 +15446,10 @@ msgid "Due By"
 msgstr "Erääntyy"
 
 #: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "Lähetetyt viestit"
+#, fuzzy
+#| msgid "Messages"
+msgid "Messages To"
+msgstr "Viestit"
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -14100,49 +15460,49 @@ msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:2015
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1987
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #. 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:96
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
-#: ../modules/addressbook/autocompletion-config.c:99
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../modules/addressbook/autocompletion-config.c:102
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:111
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Automaattinen täydennys"
 
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
 
@@ -14166,443 +15526,331 @@ msgstr "Yhteystiedot"
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:131
+#: ../modules/addressbook/e-book-shell-backend.c:259
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:238
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:245
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:255
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:356
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:204
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:386
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:479
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
 msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 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:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "D_elete Address Book"
 msgstr "_Poista osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:820
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrä kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 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:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "Re_fresh"
+msgstr "Vi_rkistä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
+#| msgid "Rename the selected address book"
+msgid "Refresh the selected address book"
+msgstr "Päivitä valittu osoitekirja"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 #, fuzzy
 msgid "Address Book _Map"
 msgstr "Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Show map with all contacts from selected address book"
-msgstr "Kopioi valitun osoitekirjan sisältö toiseen osoitekirjaan"
+msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/addressbook/e-book-shell-view-actions.c:931
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
 msgid "Rename the selected address book"
 msgstr "Nimeä valittu osoitekirja uudestaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "_Find in Contact..."
 msgstr "_Etsi yhteystiedosta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Search for text in the displayed contact"
 msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Send selected contacts to another person"
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Move selected contacts to another address book"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
 msgid "_Open Contact"
 msgstr "_Avaa yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti henkilölle..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Send a message to the selected contacts"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-task-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
-#: ../modules/calendar/e-memo-shell-view-actions.c:702
-#: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1475
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1774
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
-#: ../modules/calendar/e-task-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/mail/e-mail-shell-view-actions.c:1525
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Address Book Map"
 msgstr "Osoitekirjakartta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:1078
 msgid "Show _Maps"
 msgstr "Näytä _kartat"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
 #, fuzzy
 msgid "Show maps in contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1904
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1019
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/addressbook/e-book-shell-view-actions.c:1106
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1911
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/addressbook/e-book-shell-view-actions.c:1108
 msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-msgid "Any Category"
-msgstr "Mikä tahansa luokka"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1041
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
-#: ../shell/e-shell-content.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../shell/e-shell-content.c:658
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1084
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
 msgid "Print all shown contacts"
 msgstr "Tulosta kaikki näytettävät yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1091
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1180
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1115
+#: ../modules/addressbook/e-book-shell-view-actions.c:1197
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
-#: ../modules/addressbook/e-book-shell-view-actions.c:1131
+#: ../modules/addressbook/e-book-shell-view-actions.c:1203
+#: ../modules/addressbook/e-book-shell-view-actions.c:1213
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "Anonyymisti"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
-msgid "Using email address"
-msgstr "Käytetään sähköpostiosoitetta"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
-msgid "Using distinguished name (DN)"
-msgstr "Käytetään yksilöllistä nimeä (DN)"
-
-#. 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:8
-msgid "One"
-msgstr "Yksi"
-
-#. 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:10
-msgid "Sub"
-msgstr "Ali"
-
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "Supported Search Bases"
-msgstr "Tuetut hakupohjat"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
-msgid "_Port:"
-msgstr "_Portti:"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "_Palvelin:"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "_Käytä salattua yhteyttä:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "_Kirjautumismenetelmä:"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "_Kirjautuminen:"
-
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "Haku_pohja:"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "_Search scope:"
-msgstr "_Hakualue:"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "_Find Possible Search Bases"
-msgstr "_Etsi mahdolliset hakupohjat"
-
-#: ../modules/addressbook/ldap-config.ui.h:21
-#, fuzzy
-msgid "S_earch filter:"
-msgstr "Haku_suodatin:"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "Hakusuodatin"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-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\"."
-msgstr ""
-"Hakusuodatin määrittää etsittävien kohteiden tyypin hakua varten. Jos "
-"asetusta ei muuteta, etsitään oletuksena \"person\"-tyypin kohderyhmästä."
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:30
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
-msgid "contacts"
-msgstr "yhteystietoa"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Aikakatkaisu:"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "_Haun rajoitus:"
-
-#. 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:34
-msgid "B_rowse this book until limit reached"
-msgstr "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
-
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio.c:316
 msgid "Audio Player"
 msgstr "Äänisoitin"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+#: ../modules/audio-inline/e-mail-formatter-audio.c:317
 msgid "Play the attachment in embedded audio player"
 msgstr ""
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:167
-#| msgid ""
-#| "You can restore Evolution from your backup. It can restore all the Mails, "
-#| "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-#| "settings, mail filters etc."
+#: ../modules/backup-restore/e-mail-config-restore-page.c:165
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -14613,21 +15861,18 @@ msgstr ""
 "Palautus palauttaa kaikki henkilökohtaiset tiedot, asetukset, "
 "sähköpostisuodattimet jne."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:182
-#| msgid "Restore from backup"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:180
 msgid "_Restore from a backup file:"
 msgstr "_Palauta varmuuskopiotiedostosta:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:193
-#| msgid "Choose a file to restore"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:191
 msgid "Choose a backup file to restore"
 msgstr "Valitse palautettava varmuuskopiotiedosto"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-page.c:311
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
-#| msgid "Restore from backup"
 msgid "Restore from Backup"
 msgstr "Palauta varmuuskopiosta"
 
@@ -14663,106 +15908,106 @@ msgstr "Palauta _Evolutionin tiedot..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:84
 msgid "Back up Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:86
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:88
 msgid "Check Evolution Back up"
 msgstr "Tarkista Evolutionin varmuuskopio"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:90
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:92
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:315
-#: ../modules/backup-restore/evolution-backup-tool.c:469
+#: ../modules/backup-restore/evolution-backup-tool.c:322
+#: ../modules/backup-restore/evolution-backup-tool.c:516
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:324
+#: ../modules/backup-restore/evolution-backup-tool.c:331
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:341
+#: ../modules/backup-restore/evolution-backup-tool.c:348
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
 "kalentereita, tehtäviä ja muistioita)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:357
+#: ../modules/backup-restore/evolution-backup-tool.c:364
 msgid "Back up complete"
 msgstr "Varmuuskopiointi valmistui"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:364
-#: ../modules/backup-restore/evolution-backup-tool.c:659
+#: ../modules/backup-restore/evolution-backup-tool.c:371
+#: ../modules/backup-restore/evolution-backup-tool.c:703
 msgid "Restarting Evolution"
 msgstr "Käynnistetään Evolution uudestaan"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:475
+#: ../modules/backup-restore/evolution-backup-tool.c:522
 msgid "Back up current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:483
+#: ../modules/backup-restore/evolution-backup-tool.c:529
 msgid "Extracting files from back up"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:611
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:629
+#: ../modules/backup-restore/evolution-backup-tool.c:677
 msgid "Removing temporary back up files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:641
+#: ../modules/backup-restore/evolution-backup-tool.c:688
 msgid "Reloading registry service"
-msgstr ""
+msgstr "Ladataan uudelleen rekisteripalvelua"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 msgid "Evolution Back Up"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:871
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:940
+#: ../modules/backup-restore/evolution-backup-tool.c:991
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:941
+#: ../modules/backup-restore/evolution-backup-tool.c:992
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, että Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:944
+#: ../modules/backup-restore/evolution-backup-tool.c:995
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:962
+#: ../modules/backup-restore/evolution-backup-tool.c:1017
 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ä."
@@ -14820,86 +16065,90 @@ msgstr "Oikeudet eivät riitä"
 msgid "The selected folder is not writable."
 msgstr "Valittuun kansioon ei voi kirjoittaa."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, fuzzy, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "Bogofilter-asetukset"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:449
-#, fuzzy
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
 #| msgid "S_tandard Font:"
 msgid "Standard LDAP Port"
-msgstr "_Oletuskirjasin:"
+msgstr "Standardi LDAP_portti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:455
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
 msgid "LDAP over SSL (deprecated)"
-msgstr ""
+msgstr "LDAP SSL:n yli (vanhennettu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:461
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:467
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
 msgid "Microsoft Global Catalog over SSL"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:572
-#| msgid "Reconnecting to '%s'"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:589
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:632
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:656
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
-#| msgid "Anonymously"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:687
-#, fuzzy
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+msgid "Using email address"
+msgstr "Käytetään sähköpostiosoitetta"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+msgid "Using distinguished name (DN)"
+msgstr "Käytetään yksilöllistä nimeä (DN)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
 #| msgid "Input Methods"
 msgid "Method:"
-msgstr "Syötemenetelmät"
+msgstr "Menetelmä:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 #, fuzzy
 #| msgid ""
 #| "This is the method Evolution will use to authenticate you.  Note that "
@@ -14915,40 +16164,38 @@ msgstr ""
 "palvelimellesi."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:707
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:724
-#: ../modules/mail/e-mail-shell-view.c:116
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
+#: ../modules/mail/e-mail-shell-view.c:117
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:746
-#| msgid "Search _base:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:751
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
 #, fuzzy
 #| msgid "_Find Possible Search Bases"
 msgid "Find Possible Search Bases"
 msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
-#| msgid "_Search scope:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend "
@@ -14966,73 +16213,71 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
-#| msgid "Search Filter"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "Limit:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+msgid "contacts"
+msgstr "yhteystietoa"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
 #, fuzzy
 #| msgid "B_rowse this book until limit reached"
 msgid "Browse until limit is reached"
 msgstr "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
-#| msgid "_URL:"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
 #, fuzzy
 #| msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
 #, c-format
-#| msgid "Priority: %s"
 msgid "HTTP Error: %s"
 msgstr "HTTP-virhe: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
 #, fuzzy
 #| msgid "Could not parse PGP message: "
 msgid "Could not parse response"
 msgstr "PGP-viestiä ei voitu tulkita:"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
-#| msgid "_Empty Trash"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
 msgid "Empty response"
 msgstr "Tyhjä vastaus"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
-#| msgid "Send _reply to sender"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
 msgid "Unexpected reply from server"
 msgstr "Odottamaton vastaus palvelimelta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
 #, fuzzy
 #| msgid "Could not find any user calendar."
 msgid "Could not locate user's calendars"
 msgstr "Yhtään käyttäjäkalenteria ei löytynyt."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
-#| msgid "_Path:"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
 msgid "Path"
 msgstr "Polku"
 
 #: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
 #: ../modules/cal-config-google/e-google-chooser-dialog.c:200
-#| msgid "Choose calendar file"
 msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
@@ -15048,234 +16293,215 @@ msgstr "Uusi muistilappulista"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
 #, fuzzy
 #| msgid "Web Calendars"
 msgid "Find Calendars"
 msgstr "Web-kalenterit"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-#| msgid "_Path:"
-msgid "Path:"
-msgstr "Polku:"
-
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
-#| msgid "Email"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
 msgid "Email:"
 msgstr "Sähköposti_"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
-#, fuzzy
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
 msgid "Server handles meeting invitations"
-msgstr "Kokouksen tiedot"
+msgstr "Palvelin hallitsee tapaamiskutsuja"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
-#, fuzzy
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 #| msgid "Add local address books to Evolution."
 msgid "Choose which address books to use."
-msgstr "Lisää paikallisia osoitekirjoja Evolutioniin."
+msgstr "Valitse käytettävät osoitekirjat."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 #, fuzzy
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Syntymä- ja vuosipäivät"
 
 #: ../modules/cal-config-google/e-google-chooser-button.c:127
-#| msgid "D_elete Calendar"
 msgid "Default User Calendar"
 msgstr "Käyttäjän oletuskalenteri"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
+#: ../modules/cal-config-google/e-google-chooser.c:515
 #, c-format
-#| msgid "Enter Password for %s"
 msgid "Enter Google password for user '%s'."
 msgstr "Anna käyttäjän '%s' Google-salasana."
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
+#: ../modules/cal-config-google/e-google-chooser.c:532
 msgid "User declined to provide a password"
 msgstr "Käyttäjä kieltäytyi antamasta salasanaa"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+#: ../modules/cal-config-local/evolution-cal-config-local.c:160
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Käytä olemassa olevaa iCalendar (ics) -tiedostoa"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:186
-#| msgid "iCalendar (.ics)"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:185
 msgid "iCalendar File"
 msgstr "iCalendar-tiedosto"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
-#| msgid "Choose calendar file"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:197
 msgid "Choose an iCalendar file"
 msgstr "Valitse iCalendar-tiedosto"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:201
-#| msgid "_File:"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:200
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:216
-#| msgid "Invalid Evolution backup file"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:215
 msgid "Allow Evolution to update the file"
 msgstr "Salli Evolutionin päivittää tiedosto"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:323
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../modules/calendar/e-cal-attachment-handler.c:320
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "_Tuo"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:409
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:436
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:446
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "Tuo _kalenteriin"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:453
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "_Tuo tehtäviin"
 
-#: ../modules/calendar/e-calendar-preferences.c:407
+#: ../modules/calendar/e-calendar-preferences.c:517
 #, fuzzy
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../modules/calendar/e-calendar-preferences.c:830
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Tuntia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Päivää"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "5 minuuttia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "Aika"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "_Toinen aikavyöhyke:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(Näytetään päivänäkymässä)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Näytä _järjestelmän aikavyöhyke"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Work Week"
 msgstr "Työviikko"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "_Viikon ensimmäinen päivä:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Työpäivät:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Ma"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Ti"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Ke"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "_To"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Pe"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_La"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "_Su"
 
@@ -15385,72 +16611,72 @@ msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä
 msgid "Publishing Information"
 msgstr "Julkaisupaikka"
 
-#: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:192
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:287
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1521
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:294
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:296
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:301
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:303
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:311
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:627
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:211
-msgid "Loading calendars"
-msgstr "Ladataan kalentereita"
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Avataan kalenteria %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:731
+#: ../modules/calendar/e-cal-shell-sidebar.c:591
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1090
-#, c-format
-#| msgid "Opening calendar at %s"
-msgid "Opening calendar '%s'"
-msgstr "Avataan kalenteria %s"
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Tulosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:292
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -15461,369 +16687,361 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "Kopioidaan tiedostoja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 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:1218
+#: ../modules/calendar/e-cal-shell-view-actions.c:1211
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../modules/calendar/e-cal-shell-view-actions.c:1213
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:549
-#: ../modules/calendar/e-task-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
-msgid "Re_fresh"
-msgstr "Vi_rkistä"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Find _next"
 msgstr "Etsi _seuraava"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1430
 #, fuzzy
 #| msgid "Find the next occurrence of the phrase"
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#| msgid "_Previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Find _previous"
 msgstr "Etsi _edellinen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 #, fuzzy
 #| msgid "Find the previous occurrence of the phrase"
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Stop _running search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../modules/calendar/e-cal-shell-view-actions.c:1472
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "New All Day _Event..."
 msgstr "Uusi koko pä_ivän tapahtuma..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1554
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "Conv_ert to Appointment..."
 msgstr "_Muunna kokoukseksi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1568
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Day"
 msgstr "Päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1729
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1704
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Week"
 msgstr "Viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1774
+#: ../modules/calendar/e-cal-shell-view-actions.c:1747
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1778
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1812
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
-#: ../modules/calendar/e-task-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1785
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1831
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:868
-#: ../modules/calendar/e-task-shell-view-actions.c:1067
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "_Tallenna iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1930
+#: ../modules/calendar/e-cal-shell-view-actions.c:1903
 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:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:547
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
 msgstr "muistilappu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:204
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:688
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "Näytä valittu muistilappu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:853
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1496
-#| msgid "Print this event"
+#: ../modules/calendar/e-cal-shell-view-private.c:1600
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1497
+#: ../modules/calendar/e-cal-shell-view-private.c:1601
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1518
+#: ../modules/calendar/e-cal-shell-view-private.c:1622
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1522
+#: ../modules/calendar/e-cal-shell-view-private.c:1626
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1547
+#: ../modules/calendar/e-cal-shell-view-private.c:1651
 msgid "Cannot search with no active calendar"
 msgstr ""
 
@@ -15832,22 +17050,22 @@ msgstr ""
 #. 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:296
-#: ../modules/calendar/e-task-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
 msgstr "tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
@@ -15856,222 +17074,212 @@ msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtävät keskeneräisiksi"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:201
-#: ../modules/calendar/e-task-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1052
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
-#: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:202
+#: ../modules/calendar/e-memo-shell-backend.c:217
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:209
+#: ../modules/calendar/e-memo-shell-backend.c:224
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:211
+#: ../modules/calendar/e-memo-shell-backend.c:226
 msgid "Create a new shared memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-backend.c:234
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-backend.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:206
-msgid "Loading memos"
-msgstr "Ladataan muistilappuja"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:663
-msgid "Memo List Selector"
-msgstr "Muistilappuluetteloiden valitsin"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:975
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
-#| msgid "Opening memos at %s"
 msgid "Opening memo list '%s'"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../modules/calendar/e-memo-shell-sidebar.c:547
+msgid "Memo List Selector"
+msgstr "Muistilappuluetteloiden valitsin"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
 msgstr "_Etsi muistilapusta..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr "Etsi tekstiä näytettävästä muistilapusta"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "D_elete Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Delete the selected memo list"
 msgstr "Poista valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Refresh the selected memo list"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:667
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:672
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:753
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view.c:236
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
 msgstr "Poista muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
 msgstr "Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:432
-#: ../modules/calendar/e-task-shell-view-private.c:613
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:746
 #, c-format
 msgid "%d selected"
 msgstr ", %d valittu"
 
-#: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:240
+#: ../modules/calendar/e-task-shell-backend.c:205
+#: ../modules/calendar/e-task-shell-view-actions.c:219
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:199
+#: ../modules/calendar/e-task-shell-backend.c:214
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../modules/calendar/e-task-shell-backend.c:206
+#: ../modules/calendar/e-task-shell-backend.c:221
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:208
+#: ../modules/calendar/e-task-shell-backend.c:223
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-backend.c:231
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:218
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-backend.c:233
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:206
-msgid "Loading tasks"
-msgstr "Ladataan tehtäviä"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:663
-msgid "Task List Selector"
-msgstr "Tehtävienluetteloiden valitsin"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:975
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
-#| msgid "Opening tasks at %s"
 msgid "Opening task list '%s'"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-task-shell-sidebar.c:547
+msgid "Task List Selector"
+msgstr "Tehtävienluetteloiden valitsin"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:312
+#: ../modules/calendar/e-task-shell-view-actions.c:291
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:608
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16083,450 +17291,406 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:615
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 msgid "Do not ask me again"
 msgstr "Älä kysy uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
 msgstr "_Etsi tehtävästä..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr "Etsi tekstiä näytettävästä tehtävästä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
 msgstr "Kopioi..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
 msgstr "_Poista tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Delete the selected task list"
 msgstr "Poista valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Refresh the selected task list"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:810
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:840
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:917
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 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:945
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 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:953
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1038
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../modules/calendar/e-task-shell-view.c:371
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:502
+#: ../modules/calendar/e-task-shell-view-private.c:631
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-task-shell-view-private.c:742
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
-msgid "IMAP Headers"
-msgstr "IMAP-otsakkeet"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
-msgid ""
-"Select a predefined set of IMAP headers to fetch.\n"
-"Note, larger sets of headers take longer to download."
-msgstr ""
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
-msgid "_Fetch All Headers"
-msgstr "Nouda _kaikki otsakkeet"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
-#, fuzzy
-#| msgid "Mail Headers Table"
-msgid "_Basic Headers (fastest)"
-msgstr "Sähköposti otsikkotaulu"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
-#, fuzzy
-msgid "Use this if you are not filtering any mailing lists."
-msgstr ""
-"_Perusotsakkeet (nopein)\n"
-"Käytä tätä, jos sinulla ei ole otsakkeisiin perustuvia postituslistasuotimia"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
-#, fuzzy
-#| msgid "Basic and _Mailing List Headers (Default)"
-msgid "Basic and _Mailing List Headers (default)"
-msgstr "Tavalliset ja _postituslistojen otsakkeet (oletus)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
-msgid "Custom Headers"
-msgstr "Omat otsakkeet"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
-msgid ""
-"Specify any extra headers to fetch in addition to the predefined set of "
-"headers selected above."
-msgstr ""
-
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:139
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:240
+#: ../modules/itip-formatter/itip-view.c:235
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:244
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:253
+#: ../modules/itip-formatter/itip-view.c:248
 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.
-#: ../modules/itip-formatter/itip-view.c:268
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:277
+#: ../modules/itip-formatter/itip-view.c:272
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:281
+#: ../modules/itip-formatter/itip-view.c:276
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:295
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:305
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:304
 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.
-#: ../modules/itip-formatter/itip-view.c:314
+#: ../modules/itip-formatter/itip-view.c:309
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:318
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:327
+#: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
-msgstr "+%Ana %d. %Bn %Y"
+msgstr "+%Ana %e. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:333
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
-msgstr "+%Ana %d. %Bn klo %H.%M"
+msgstr "+%Ana %e. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
-msgstr "+%Ana %d. %Bn klo %H.%M.%S"
+msgstr "+%Ana %e. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:342
+#: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
-msgstr "+%Ana %d. %Bn klo %l.%M %p"
+msgstr "+%Ana %e. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:346
+#: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "+%Ana %d. %Bn klo %l.%M.%S %p"
+msgstr "+%Ana %e. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
-msgstr "%Ana %d. %Bta %Y"
+msgstr "%Ana %e. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Ana %d. %Bta %Y klo %H.%M"
+msgstr "%Ana %e. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Ana %d. %Bta %Y klo %H.%M.%S"
+msgstr "%Ana %e. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:366
+#: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Ana %d. %Bta %Y klo %l.%M %p"
+msgstr "%Ana %e. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:370
+#: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Ana %d. %Bta %Y klo %l.%M.%S %p"
+msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:409
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:499
-#: ../modules/itip-formatter/itip-view.c:588
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../modules/itip-formatter/itip-view.c:413
-#: ../modules/itip-formatter/itip-view.c:503
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:415
-#: ../modules/itip-formatter/itip-view.c:505
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:417
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:435
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s perui seuraavan kokouksen %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../modules/itip-formatter/itip-view.c:462
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../modules/itip-formatter/itip-view.c:464
+#: ../modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:468
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:470
+#: ../modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -16534,339 +17698,341 @@ msgid ""
 msgstr ""
 "%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 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:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:552
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:554
+#: ../modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:558
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:560
+#: ../modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:606
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:608
+#: ../modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../modules/itip-formatter/itip-view.c:612
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:614
+#: ../modules/itip-formatter/itip-view.c:609
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s on perunut seuraavan jaetun muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:687
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:688
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1473
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:697
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1474
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:1022
-msgid "_Open Calendar"
+#: ../modules/itip-formatter/itip-view.c:1016
+#| msgid "_Open Calendar"
+msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:1025
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../modules/itip-formatter/itip-view.c:1031
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1037
-msgid "A_ccept all"
+#: ../modules/itip-formatter/itip-view.c:1031
+#| msgid "A_ccept all"
+msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1040
-msgid "A_ccept"
-msgstr "_Hyväksy"
+#: ../modules/itip-formatter/itip-view.c:1034
+#| msgid "Accepted"
+msgid "Acce_pt"
+msgstr "H_yväksy"
 
-#: ../modules/itip-formatter/itip-view.c:1043
-msgid "_Send Information"
+#: ../modules/itip-formatter/itip-view.c:1037
+#, fuzzy
+#| msgid "_Send Information"
+msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../modules/itip-formatter/itip-view.c:1046
+#: ../modules/itip-formatter/itip-view.c:1040
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../modules/itip-formatter/itip-view.c:1049
+#: ../modules/itip-formatter/itip-view.c:1043
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../modules/itip-formatter/itip-view.c:1476
-#: ../modules/itip-formatter/itip-view.c:1524
-#: ../modules/itip-formatter/itip-view.c:1595
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1512
-#| msgid "Send _reply to sender"
+#: ../modules/itip-formatter/itip-view.c:1529
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1527
+#: ../modules/itip-formatter/itip-view.c:1544
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1530
+#: ../modules/itip-formatter/itip-view.c:1547
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../modules/itip-formatter/itip-view.c:1531
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../modules/itip-formatter/itip-view.c:1532
+#: ../modules/itip-formatter/itip-view.c:1549
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1533
+#: ../modules/itip-formatter/itip-view.c:1550
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1861
+#: ../modules/itip-formatter/itip-view.c:1880
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:1864
+#: ../modules/itip-formatter/itip-view.c:1883
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3511
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+#: ../modules/itip-formatter/itip-view.c:3111
+msgid "Sa_ve"
+msgstr "_Tallenna"
 
-#: ../modules/itip-formatter/itip-view.c:3670
+#: ../modules/itip-formatter/itip-view.c:3571
+#: ../modules/itip-formatter/itip-view.c:5016
+msgid "Attendee status updated"
+msgstr "Läsnäolon tila päivitetty"
+
+#: ../modules/itip-formatter/itip-view.c:3750
 #, 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"
 
-#: ../modules/itip-formatter/itip-view.c:3699
+#: ../modules/itip-formatter/itip-view.c:3779
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../modules/itip-formatter/itip-view.c:3812
+#: ../modules/itip-formatter/itip-view.c:3892
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:3820
+#: ../modules/itip-formatter/itip-view.c:3900
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../modules/itip-formatter/itip-view.c:3825
+#: ../modules/itip-formatter/itip-view.c:3905
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../modules/itip-formatter/itip-view.c:3830
+#: ../modules/itip-formatter/itip-view.c:3910
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../modules/itip-formatter/itip-view.c:4179
+#: ../modules/itip-formatter/itip-view.c:4254
 msgid "Opening the calendar. Please wait..."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4184
+#: ../modules/itip-formatter/itip-view.c:4259
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../modules/itip-formatter/itip-view.c:4573
+#: ../modules/itip-formatter/itip-view.c:4652
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../modules/itip-formatter/itip-view.c:4588
+#: ../modules/itip-formatter/itip-view.c:4667
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../modules/itip-formatter/itip-view.c:4593
+#: ../modules/itip-formatter/itip-view.c:4672
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../modules/itip-formatter/itip-view.c:4599
+#: ../modules/itip-formatter/itip-view.c:4678
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../modules/itip-formatter/itip-view.c:4605
+#: ../modules/itip-formatter/itip-view.c:4684
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../modules/itip-formatter/itip-view.c:4626
-#: ../modules/itip-formatter/itip-view.c:5066
-#: ../modules/itip-formatter/itip-view.c:5173
+#: ../modules/itip-formatter/itip-view.c:4705
+#: ../modules/itip-formatter/itip-view.c:5162
+#: ../modules/itip-formatter/itip-view.c:5268
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4667
+#: ../modules/itip-formatter/itip-view.c:4746
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../modules/itip-formatter/itip-view.c:4857
+#: ../modules/itip-formatter/itip-view.c:4939
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../modules/itip-formatter/itip-view.c:4872
+#: ../modules/itip-formatter/itip-view.c:4956
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:4876
+#: ../modules/itip-formatter/itip-view.c:4960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:4924
+#: ../modules/itip-formatter/itip-view.c:5008
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4932
-msgid "Attendee status updated"
-msgstr "Läsnäolon tila päivitetty"
-
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:5051
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../modules/itip-formatter/itip-view.c:5031
+#: ../modules/itip-formatter/itip-view.c:5127
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../modules/itip-formatter/itip-view.c:5103
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5199
+#: ../modules/itip-formatter/itip-view.c:5238
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5206
+#: ../modules/itip-formatter/itip-view.c:5301
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5211
+#: ../modules/itip-formatter/itip-view.c:5306
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5216
+#: ../modules/itip-formatter/itip-view.c:5311
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5227
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:5232
+#: ../modules/itip-formatter/itip-view.c:5327
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5237
+#: ../modules/itip-formatter/itip-view.c:5332
 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.
-#: ../modules/itip-formatter/itip-view.c:5302
+#: ../modules/itip-formatter/itip-view.c:5397
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5307
+#: ../modules/itip-formatter/itip-view.c:5402
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:5360
-#: ../modules/itip-formatter/itip-view.c:5373
+#: ../modules/itip-formatter/itip-view.c:5451
+#: ../modules/itip-formatter/itip-view.c:5464
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5361
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5452
+#: ../modules/itip-formatter/itip-view.c:5465
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16874,15 +18040,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../modules/itip-formatter/itip-view.c:5416
-#: ../modules/itip-formatter/itip-view.c:5446
-#: ../modules/itip-formatter/itip-view.c:5546
+#: ../modules/itip-formatter/itip-view.c:5507
+#: ../modules/itip-formatter/itip-view.c:5537
+#: ../modules/itip-formatter/itip-view.c:5638
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5417
-#: ../modules/itip-formatter/itip-view.c:5447
-#: ../modules/itip-formatter/itip-view.c:5547
+#: ../modules/itip-formatter/itip-view.c:5508
+#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5639
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16890,11 +18056,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../modules/itip-formatter/itip-view.c:5462
+#: ../modules/itip-formatter/itip-view.c:5553
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5554
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16902,24 +18068,24 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../modules/itip-formatter/itip-view.c:5987
+#: ../modules/itip-formatter/itip-view.c:6055
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/itip-formatter/itip-view.c:6003
+#: ../modules/itip-formatter/itip-view.c:6071
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../modules/itip-formatter/itip-view.c:6146
+#: ../modules/itip-formatter/itip-view.c:6231
 msgid "This meeting recurs"
 msgstr "Tapaaminen on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6149
+#: ../modules/itip-formatter/itip-view.c:6234
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6152
+#: ../modules/itip-formatter/itip-view.c:6237
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
@@ -16967,22 +18133,18 @@ msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Näytä \"text/calendar\"-MIME-osat viesteissä."
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:252
-#| msgid "Google Calendars"
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:261
-#| msgid "Add Google Calendars to Evolution."
 msgid "Add Google Ca_lendar to this account"
 msgstr "Lisää _Google-kalenteri tähän tiliin"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:269
-#| msgid "Add Google Calendars to Evolution."
 msgid "Add Google Con_tacts to this account"
 msgstr "Lisää Google-_yhteystiedot tähän tiliin"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:277
-#| msgid "You may need to enable IMAP access."
 msgid "You may need to enable IMAP access"
 msgstr "Sinun on mahdollisesti sallittava IMAP-käyttö"
 
@@ -17039,547 +18201,599 @@ msgstr "Tallenna kansio"
 msgid "Choose a mbox spool directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+msgid "_Port:"
+msgstr "_Portti:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
 msgid "Encryption _method:"
 msgstr "Salaus_tapa:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "STARTTLS after connecting"
-msgstr ""
+msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
 msgid "SSL on a dedicated port"
+msgstr "SSL tietyssä portissa"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "_Käytä omavalintaista binääriä 'sendmail'-binäärin sijaan"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#| msgid "Custom Reminder:"
+msgid "_Custom binary:"
+msgstr "_Omavalintainen binääri:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "U_se custom arguments"
+msgstr "Käytä omia kirjasimia"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#, fuzzy
+#| msgid "_Arguments:"
+msgid "Cus_tom arguments:"
+msgstr "_Argumentit:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#, fuzzy
+#| msgid "Start in offline mode"
+msgid "Send mail also when in offline _mode"
+msgstr "Aloita yhteydettömässä tilassa"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
 #: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
-#| msgid "IMAP Features"
 msgid "Yahoo! Features"
 msgstr "Yahoo!-ominaisuudet"
 
 #: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
-#, fuzzy
 #| msgid "Add Google Calendars to Evolution."
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
-msgstr "Lisää Google-kalentereita Evolutioniin."
+msgstr "Lisää Yahoo!-kalenteri ja -tehtävät tälle tilille"
 
-#: ../modules/mail/e-mail-attachment-handler.c:368
-#, fuzzy, c-format
+#: ../modules/mail/e-mail-attachment-handler.c:425
+#, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
-msgstr[1] "%d liitetty viesti"
+msgstr[1] "%d liitettyä viestiä"
 
-#: ../modules/mail/e-mail-shell-backend.c:244
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:246
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:254
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:256
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:261
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:263
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:561
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:570
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:579
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:588
+#: ../modules/mail/e-mail-shell-backend.c:578
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:890
-#| msgid "None"
+#: ../modules/mail/e-mail-shell-backend.c:867
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
-#: ../modules/mail/e-mail-shell-view.c:975
+#: ../modules/mail/e-mail-shell-view-actions.c:659
+#| msgid "Mark Me_ssages as Read"
+msgid "Marking messages as read..."
+msgstr "Merkitään viestejä luetuiksi..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1520
 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:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1532
+#| msgctxt "Meeting"
+#| msgid "Refresh"
+msgid "_Refresh"
+msgstr "_Päivitä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1534
+#| msgid "Edit properties of this account"
+msgid "Refresh list of folders of this account"
+msgstr "Päivitä tämän tilin kansioiden luettelo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1541
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1546
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1553
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 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:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1284
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1676
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 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:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
-#: ../modules/mail/e-mail-shell-view-actions.c:1454
+#: ../modules/mail/e-mail-shell-view-actions.c:1669
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
+#: ../modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Receive new items from all accounts"
-msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
+msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
-#: ../widgets/misc/e-activity-proxy.c:313
-msgid "Cancel"
-msgstr "Peru"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1494
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../modules/mail/e-mail-shell-view-actions.c:1862
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1870
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1878
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1884
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1886
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1906
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1913
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1928
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../modules/mail/e-mail-shell-view-actions.c:1935
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
+#: ../modules/mail/e-mail-shell-view-actions.c:1949
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1956
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1660
+#: ../modules/mail/e-mail-shell-view-actions.c:1963
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1970
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
+#: ../modules/mail/e-mail-shell-view-actions.c:2046
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../modules/mail/e-mail-shell-view.c:613
+#: ../modules/mail/e-mail-shell-view.c:630
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:710
+#: ../modules/mail/e-mail-shell-view.c:734
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:973
-msgid "Proxy _Logout"
-msgstr "Kirjaudu _pois välimuistista"
-
-#: ../modules/mail/e-mail-shell-view-private.c:962
+#: ../modules/mail/e-mail-shell-view-private.c:988
 #, 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:973
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, 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:979
-#: ../modules/mail/e-mail-shell-view-private.c:986
+#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, 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:992
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 #, 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:998
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 #, 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:1004
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, 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:1016
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, 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:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 msgid "Trash"
-msgstr ""
+msgstr "Roskakori"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1458
+#: ../modules/mail/e-mail-shell-view-private.c:1522
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../modules/mail/em-mailer-prefs.c:86
-msgid "Every time"
-msgstr "Joka kerta"
+#: ../modules/mail/em-mailer-prefs.c:81
+#| msgid "Every time"
+msgid "On exit, every time"
+msgstr "Poistuessa, joka kerta"
+
+#: ../modules/mail/em-mailer-prefs.c:82
+#| msgid "Once per day"
+msgid "On exit, once per day"
+msgstr "Poistuessa, kerran päivässä"
 
-#: ../modules/mail/em-mailer-prefs.c:87
-msgid "Once per day"
-msgstr "Kerran päivässä"
+#: ../modules/mail/em-mailer-prefs.c:83
+#| msgid "Once per week"
+msgid "On exit, once per week"
+msgstr "Poistuessa, kerran viikossa"
 
-#: ../modules/mail/em-mailer-prefs.c:88
-msgid "Once per week"
-msgstr "Kerran viikossa"
+#: ../modules/mail/em-mailer-prefs.c:84
+#| msgid "Once per month"
+msgid "On exit, once per month"
+msgstr "Poistuessa, kerran kuussa"
 
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Once per month"
-msgstr "Kerran kuussa"
+#: ../modules/mail/em-mailer-prefs.c:85
+msgid "Immediately, on folder leave"
+msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:318
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Otsake"
 
-#: ../modules/mail/em-mailer-prefs.c:322
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "Sisältää arvon"
 
 #. 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:1145
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../modules/mail/em-mailer-prefs.c:1146
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:323
+#: ../modules/mdn/evolution-mdn.c:311
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti ”%2$s” on luettu."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:390
+#: ../modules/mdn/evolution-mdn.c:378
 #, fuzzy, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Toimituskuittaus viestille: ”%s”"
@@ -17591,17 +18805,16 @@ msgstr "Läh_etä viestin kuittaus:"
 
 #. name doesn't matter
 #: ../modules/mdn/evolution-mdn.c:548
-#, fuzzy
 msgid "_Notify Sender"
-msgstr "Älä läh_etä"
+msgstr "_Ilmoita lähettäjälle"
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:1
 msgid "Sender wants to be notified when you have read this message."
-msgstr ""
+msgstr "Lähettäjä haluaa tiedon, kun olet lukenut viestin."
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender has been notified that you have read this message."
-msgstr ""
+msgstr "Lähettäjälle on ilmoitettu, että luit hänen viestinsä."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Evolution is currently offline."
@@ -17623,57 +18836,40 @@ msgid ""
 "established."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Lisäosien hallinta"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Lisäosa"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Lisäosat"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Käytä ja poista käytöstä lisäosia"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
-#, fuzzy
 #| msgid "Display the next message"
 msgid "Display plain text version"
-msgstr "Näytä seuraava viesti"
+msgstr "Näytä raakatekstiversio"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
 #, fuzzy
@@ -17683,7 +18879,7 @@ msgstr "Näytä seuraava tärkeä viesti"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version"
-msgstr ""
+msgstr "Näytä HTML-versio"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
 #, fuzzy
@@ -17691,23 +18887,23 @@ msgstr ""
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:46
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
 msgid "Let Evolution choose the best part to show."
 msgstr "Anna Evolutionin valita näytettäväksi paras osa."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
-#: ../modules/prefer-plain/plugin/config-ui.c:50
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid "Show plain text if present"
 msgstr "Näytä raakatekstinä, jos mahdollista"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:51
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -17715,13 +18911,13 @@ msgstr ""
 "Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
 "Evolutionin valita näytettäväksi paras osa."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
-#: ../modules/prefer-plain/plugin/config-ui.c:55
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid "Only ever show plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
-#: ../modules/prefer-plain/plugin/config-ui.c:56
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -17729,11 +18925,11 @@ msgstr ""
 "Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin "
 "pyydetään."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:107
+#: ../modules/prefer-plain/plugin/config-ui.c:105
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Näytä _piilotetut HTML-osat liitetiedostoina"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:129
+#: ../modules/prefer-plain/plugin/config-ui.c:127
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -17750,60 +18946,49 @@ msgstr "Raakatekstin tila"
 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öä."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 #, fuzzy
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Suodata roskaposteja spamassasinilla."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, fuzzy, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 msgid "Failed to read output from SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "Spamassassin-valitsimet"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 msgid "I_nclude remote tests"
 msgstr "_Lisää myös etätestit"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 #, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:204
-#: ../widgets/misc/e-import-assistant.c:403
-msgid "Please select the information that you would like to import:"
-msgstr "Valitse tieto jota haluaisit tuoda:"
-
-#: ../modules/startup-wizard/e-mail-config-import-page.c:233
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "Ohjelmasta %s:"
-
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "Tiedostojen tuonti"
@@ -17816,7 +19001,7 @@ msgstr "Tuonti peruttiin."
 msgid "Import complete."
 msgstr "Tuonti valmistui."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:154
+#: ../modules/startup-wizard/e-startup-assistant.c:156
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -17828,30 +19013,27 @@ msgstr ""
 "Seuraavaksi kysyttävien tietojen avulla Evolution ottaa yhteyttä "
 "sähköpostitileihisi ja tuo tarvittavia tietoja muista sovelluksista."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:242
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "Ladataan tilejä..."
 
 #: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
-#| msgid "Format Column_s..."
 msgid "_Format as..."
 msgstr "_Muotoile..."
 
 #: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
-#| msgid "_Languages"
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
 msgid "Text Highlight"
 msgstr "Tekstin korostus"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
 #: ../modules/text-highlight/languages.c:32
-#| msgid "Plain Text Mode"
 msgid "_Plain text"
 msgstr "_Raakateksti"
 
@@ -17884,7 +19066,6 @@ msgid "_Java"
 msgstr "_Java"
 
 #: ../modules/text-highlight/languages.c:87
-#| msgid "_Script:"
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
@@ -17893,7 +19074,6 @@ msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
 #: ../modules/text-highlight/languages.c:99
-#| msgid "_Personal"
 msgid "_Perl"
 msgstr "_Perl"
 
@@ -17902,7 +19082,6 @@ msgid "_PHP"
 msgstr "_PHP"
 
 #: ../modules/text-highlight/languages.c:123
-#| msgid "Hello Python"
 msgid "_Python"
 msgstr "_Python"
 
@@ -17923,7 +19102,6 @@ msgid "_Vala"
 msgstr "_Vala"
 
 #: ../modules/text-highlight/languages.c:152
-#| msgid "Visual"
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
@@ -17932,7 +19110,6 @@ msgid "_XML"
 msgstr "_XML"
 
 #: ../modules/text-highlight/languages.c:177
-#| msgid "_Actions"
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
@@ -17977,7 +19154,6 @@ msgid "_F#"
 msgstr "_F#"
 
 #: ../modules/text-highlight/languages.c:235
-#| msgid "_No"
 msgid "_Go"
 msgstr "_Go"
 
@@ -18018,7 +19194,6 @@ msgid "_Oberon"
 msgstr "_Oberon"
 
 #: ../modules/text-highlight/languages.c:288
-#| msgid "Object Signer"
 msgid "_Objective C"
 msgstr "_Objective C"
 
@@ -18031,7 +19206,6 @@ msgid "_Octave"
 msgstr "_Octave"
 
 #: ../modules/text-highlight/languages.c:304
-#| msgid "Object Signer"
 msgid "_Object Script"
 msgstr "_Object Script"
 
@@ -18044,12 +19218,10 @@ msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
 #: ../modules/text-highlight/languages.c:319
-#| msgid "_Program:"
 msgid "_Prolog"
 msgstr "_Prolog"
 
 #: ../modules/text-highlight/languages.c:324
-#| msgid "_Script:"
 msgid "_PostScript"
 msgstr "_PostScript"
 
@@ -18077,64 +19249,52 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
-#| msgid "Show Full vCard"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 msgid "Show F_ull vCard"
 msgstr "Näytä koko _vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
-#| msgid "Show Compact vCard"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 msgid "Show Com_pact vCard"
 msgstr "Näytä tiivistetty vCar_d"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
-#| msgid "Save in Address Book"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 msgid "Save _To Addressbook"
 msgstr "Tallenna _osoitekirjaan"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "Löytyi yksi muu yhteystieto."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
 #, fuzzy
 msgid "Addressbook Contact"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
 msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../modules/web-inspector/evolution-web-inspector.c:88
-#| msgid "_Select..."
-msgid "_Inspect..."
-msgstr "_Tutki..."
-
-#: ../modules/web-inspector/evolution-web-inspector.c:90
-msgid "Inspect the HTML content (debugging feature)"
-msgstr ""
-
-#: ../modules/web-inspector/evolution-web-inspector.c:102
+#: ../modules/web-inspector/evolution-web-inspector.c:96
 #, fuzzy
 #| msgid "Evolution Website"
 msgid "Evolution Web Inspector"
 msgstr "Evolutionin www-sivut"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:469
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:480
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -18166,35 +19326,35 @@ msgstr "Liitemuistuttaja"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Muistuttaa, jos unohdit lisätä liitteen viestiin."
 
-#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:635 ../plugins/bbdb/bbdb.c:644
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:674
+#: ../plugins/bbdb/bbdb.c:659
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:666
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:683
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:714
+#: ../plugins/bbdb/bbdb.c:698
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:722
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:718
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -18215,78 +19375,68 @@ msgstr ""
 "Lisää nimet ja sähköpostiosoitteet automaattisesti osoitekirjaan, kun "
 "vastaat viesteihin. Liittää myös IM-yhteystiedot tuttavalistoiltasi."
 
-#: ../plugins/dbx-import/dbx-importer.c:287
-#, fuzzy
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
-msgstr "Tuodaan tietoja Outlookista"
+msgstr "Tuodaan Outlook Expressin tietoja"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 msgid "Outlook DBX import"
 msgstr "Outlook DBX -tuonti"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-#, fuzzy
 msgid "Outlook Express 5/6 personal folders (.dbx)"
-msgstr "Outlookin omat kansiot (.pst)"
+msgstr "Outlook Express 5/6 -henkilökohtaiset kansiot (.dbx)"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
-#, fuzzy
 msgid "Import Outlook Express messages from DBX file"
-msgstr "Tuo outlook-viestejä PST-tiedostosta."
+msgstr "Tuodaan Outlook Express -viestejä DBX-tiedostosta"
 
 #: ../plugins/email-custom-header/email-custom-header.c:291
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Turvallisuus:"
 
 #: ../plugins/email-custom-header/email-custom-header.c:295
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
 #: ../plugins/email-custom-header/email-custom-header.c:296
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
-msgstr "Ei luokiteltu"
+msgstr "Luokittelematon"
 
 #: ../plugins/email-custom-header/email-custom-header.c:297
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Suojattu"
 
 #: ../plugins/email-custom-header/email-custom-header.c:298
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #: ../plugins/email-custom-header/email-custom-header.c:299
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Salainen"
 
 #: ../plugins/email-custom-header/email-custom-header.c:300
-#, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Erittäin salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:357
+#: ../plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../plugins/email-custom-header/email-custom-header.c:530
+#: ../plugins/email-custom-header/email-custom-header.c:536
 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:799
+#: ../plugins/email-custom-header/email-custom-header.c:806
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18294,12 +19444,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:851
+#: ../plugins/email-custom-header/email-custom-header.c:859
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:477
+#: ../plugins/email-custom-header/email-custom-header.c:876
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "Arvot"
 
@@ -18316,11 +19466,11 @@ msgstr "Lisää oma otsake lähteviin viesteihin."
 msgid "Email Custom Header"
 msgstr "Omat sähköpostiotsakkeet"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:113
 #, fuzzy
 msgid ""
 "For XEmacs use \"xemacs\"\n"
@@ -18329,8 +19479,13 @@ msgstr ""
 "Emacsia varten käytä arvoa \"xemacs\"\n"
 "VI:tä varten käytä arvoa \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
+#: ../plugins/external-editor/external-editor.c:123
+#| msgid "Automatically launch when a new mail is edited"
+msgid "_Automatically launch when a new mail is edited"
+msgstr "Käynnistä _automaattisesti, kun uutta viestiä on muokattu"
+
+#: ../plugins/external-editor/external-editor.c:413
+#: ../plugins/external-editor/external-editor.c:415
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -18378,23 +19533,27 @@ msgstr ""
 "Ulkoinen muokkain on vielä käynnissä. Viestin lähetysikkunaa ei voi sulkea "
 "ennen kuin ulkoinen muokkain on käynnissä."
 
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: ../plugins/face/face.c:289
 msgid "Select a Face Picture"
 msgstr "Valitse kasvokuva"
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:299
 msgid "Image files"
 msgstr "Kuvatiedostot"
 
-#: ../plugins/face/face.c:361
+#: ../plugins/face/face.c:358
 msgid "_Insert Face picture by default"
 msgstr "_Lisää kasvokuva oletuksena"
 
-#: ../plugins/face/face.c:374
+#: ../plugins/face/face.c:371
 msgid "Load new _Face picture"
 msgstr "Lataa uusi _kasvokuva"
 
-#: ../plugins/face/face.c:435
+#: ../plugins/face/face.c:432
 msgid "Include _Face"
 msgstr "Sisällytä _kasvokuva"
 
@@ -18434,55 +19593,55 @@ msgstr "Sisäkkäiset kuvat"
 msgid "View image attachments directly in mail messages."
 msgstr "Näytä kuvaliitteet suoraan sähköpostiviesteissä."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
 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:372
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
 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:379
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
 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:386
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
 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:393
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
 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:400
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
 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:409
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -18573,58 +19732,64 @@ msgstr ""
 "\n"
 "Otsake: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:385
-#: ../plugins/mail-notification/mail-notification.c:421
+#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:420
 #, 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."
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:395
+#, c-format
+msgid "From: %s"
+msgstr "Lähettäjä: %s"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:410
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "Aihe: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
-#| msgid "Restarting Evolution"
+#: ../plugins/mail-notification/mail-notification.c:426
 msgid "New email in Evolution"
 msgstr "Uusia sähköpostiviestejä Evolutionissa"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:461
 #, c-format
 msgid "Show %s"
 msgstr "Näytä %s"
 
-#: ../plugins/mail-notification/mail-notification.c:658
+#: ../plugins/mail-notification/mail-notification.c:663
 msgid "_Play sound when a new message arrives"
 msgstr "_Soita ääni uuden sähköpostin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:695
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:708
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:722
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:731
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:787
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../plugins/mail-notification/mail-notification.c:797
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Show _notification when a new message arrives"
 msgstr "Näytä ilmoitus uusien _viestien saapuessa"
 
@@ -18637,12 +19802,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:239
+#: ../plugins/mail-to-task/mail-to-task.c:232
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18651,7 +19816,7 @@ msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin "
 "lisättyä tapahtumaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18660,7 +19825,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:628
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18669,8 +19834,7 @@ msgstr ""
 "Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata "
 "aiemmin lisättyä muistilappua?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -18681,8 +19845,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18693,8 +19856,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:659
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -18705,92 +19867,97 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:680
+#: ../plugins/mail-to-task/mail-to-task.c:677
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:755
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:767
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
+#: ../plugins/mail-to-task/mail-to-task.c:855
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#: ../plugins/mail-to-task/mail-to-task.c:851
+#: ../plugins/mail-to-task/mail-to-task.c:862
+#| msgid ""
+#| "Selected source is read only, thus cannot create event there. Select "
+#| "other source, please."
 msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 msgstr ""
-"Valittu lähde on vain luettavissa, joten et voi luoda siihen tapahtumia. "
-"Valitse joku toinen lähde."
+"Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
+"Valitse jokin toinen kalenteri."
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
+#: ../plugins/mail-to-task/mail-to-task.c:865
+#, fuzzy
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
 msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
 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:857
+#: ../plugins/mail-to-task/mail-to-task.c:868
+#, fuzzy
+#| msgid ""
+#| "Selected source is read only, thus cannot create memo there. Select other "
+#| "source, please."
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
 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:1186
-#, fuzzy
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "No writable calendar is available."
-msgstr "Ei kuvausta saatavilla."
+msgstr "Kirjoitettavaa kalenteria ei ole saatavilla."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
-#| msgid "Create a new appointment"
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1304
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -18798,38 +19965,6 @@ msgstr "Luo uusi kokous valitusta viestistä"
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtäväksi."
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
-msgid "Also mark messages in subfolders?"
-msgstr "Merkitse viestit myös alikansioissa?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:45
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
-"kaikissa sen alikansioissa?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:185
-msgid "In Current Folder and _Subfolders"
-msgstr "Nykyisessä kansiossa ja alikan_sioissa"
-
-#: ../plugins/mark-all-read/mark-all-read.c:199
-msgid "In Current _Folder Only"
-msgstr "Vain nykyisessä _kansiossa"
-
-#: ../plugins/mark-all-read/mark-all-read.c:545
-msgid "Mark Me_ssages as Read"
-msgstr "Merkitse vie_stit luetuiksi"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "Merkitse kaikki luetuksi"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "Merkitse kaikki kansion viestit luetuksi."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlookin PST-tuoja"
@@ -18842,37 +19977,37 @@ msgstr "Outlookin omat kansiot (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Tuo Outlook-viestejä PST-tiedostosta"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:530
 msgid "_Mail"
 msgstr "_Sähköposti"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:559
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: ../plugins/pst-import/pst-importer.c:594
+#: ../plugins/pst-import/pst-importer.c:569
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
-#: ../plugins/pst-import/pst-importer.c:599
+#: ../plugins/pst-import/pst-importer.c:574
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
-#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tehtävät"
 
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "_Journal entries"
 msgstr "_Päiväkirjamerkinnät"
 
-#: ../plugins/pst-import/pst-importer.c:721
+#: ../plugins/pst-import/pst-importer.c:701
 msgid "Importing Outlook data"
 msgstr "Tuodaan tietoja Outlookista"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:145
-#: ../plugins/publish-calendar/publish-calendar.c:152
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "Kalenterien julkaisu"
 
@@ -18884,49 +20019,44 @@ msgstr "Sijainnit"
 msgid "Publish calendars to the web."
 msgstr "Julkaise kalenterit verkossa."
 
-#: ../plugins/publish-calendar/publish-calendar.c:211
-#: ../plugins/publish-calendar/publish-calendar.c:463
+#: ../plugins/publish-calendar/publish-calendar.c:217
+#: ../plugins/publish-calendar/publish-calendar.c:484
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ei voitu avata %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:213
-#, c-format
-msgid "Could not open %s: Unknown error"
-msgstr "Ei voitu avata kohdetta %s: tuntematon virhe"
-
-#: ../plugins/publish-calendar/publish-calendar.c:233
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Virhe julkaistaessa kohteeseen %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:235
+#: ../plugins/publish-calendar/publish-calendar.c:242
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Julkaisu kohteeseen %s onnistui"
 
-#: ../plugins/publish-calendar/publish-calendar.c:279
+#: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Kohteen %s liittäminen epäonnistui:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:626
+#: ../plugins/publish-calendar/publish-calendar.c:649
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: ../plugins/publish-calendar/publish-calendar.c:774
+#: ../plugins/publish-calendar/publish-calendar.c:799
 msgid "Are you sure you want to remove this location?"
 msgstr "Haluatko varmasti poistaa tämän sijainnin?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1104
+#: ../plugins/publish-calendar/publish-calendar.c:1138
 msgid "Could not create publish thread."
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1112
+#: ../plugins/publish-calendar/publish-calendar.c:1148
 msgid "_Publish Calendar Information"
 msgstr "_Julkaise kalenteritietoja"
 
@@ -19018,18 +20148,17 @@ msgstr "_Muista salasana"
 msgid "Publishing Location"
 msgstr "Julkaisupaikka"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:97
-#: ../plugins/publish-calendar/publish-format-ical.c:95
-#, c-format
-msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr ""
-"Kalenteria ei voitu julkaista: kalenterin taustaohjelmaa ei enää ole olemassa"
+#: ../plugins/publish-calendar/publish-format-fb.c:100
+#: ../plugins/publish-calendar/publish-format-ical.c:103
+#, fuzzy, c-format
+msgid "Invalid source UID '%s'"
+msgstr "Virheellinen kansio: ”%s”"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:539
+#: ../plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Uusi sijainti"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:541
+#: ../plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
@@ -19040,79 +20169,79 @@ msgstr "Muokkaa sijaintia"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Comment List"
 msgstr "Kommenttilista"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "End"
 msgstr "Päättyy"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Due"
 msgstr "Erääntyy"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../plugins/save-calendar/csv-format.c:562
+#: ../plugins/save-calendar/csv-format.c:564
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV-muodon _lisäasetukset"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Prepend a _header"
 msgstr "Lisää otsake _ennen"
 
-#: ../plugins/save-calendar/csv-format.c:579
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "_Value delimiter:"
 msgstr "_Arvojen erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:592
 msgid "_Record delimiter:"
 msgstr "_Kenttien erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:603
 msgid "_Encapsulate values with:"
 msgstr "_Kapsuloi arvot käyttäen:"
 
-#: ../plugins/save-calendar/csv-format.c:627
+#: ../plugins/save-calendar/csv-format.c:629
 msgid "Comma separated values (.csv)"
 msgstr "Pilkuin erotetut arvot (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19129,31 +20258,31 @@ msgstr "Tallenna kalenteri tai tehtävälista levylle."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:146
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:385
 msgid "RDF (.rdf)"
 msgstr "RDF-tiedostot (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:123
+#: ../plugins/save-calendar/save-calendar.c:121
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../plugins/save-calendar/save-calendar.c:185
+#: ../plugins/save-calendar/save-calendar.c:187
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
-#: ../plugins/save-calendar/save-calendar.c:340
+#: ../plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:371
+#: ../plugins/save-calendar/save-calendar.c:374
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:402
+#: ../plugins/save-calendar/save-calendar.c:405
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
@@ -19164,35 +20293,40 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1112
+#: ../plugins/templates/templates.c:1148
 msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/templates.c:1221
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:1223
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
-#: ../shell/e-shell.c:313
+#: ../shell/e-shell.c:278
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:366
+#: ../shell/e-shell.c:331
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/e-shell.c:437
+#: ../shell/e-shell.c:412
+#| msgid "Preparing to quit..."
+msgid "Preparing to quit"
+msgstr "Valmistellaan sulkemista"
+
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
 msgid "Searches"
 msgstr "Haut"
 
-#: ../shell/e-shell-content.c:771
+#: ../shell/e-shell-content.c:765
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -19200,38 +20334,38 @@ msgstr "Tallenna haku"
 #. * 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:940
+#: ../shell/e-shell-searchbar.c:1102
 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:973
+#: ../shell/e-shell-searchbar.c:1136
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1217
 msgid "i_n"
 msgstr "lä_hteestä"
 
-#: ../shell/e-shell-utils.c:197
+#: ../shell/e-shell-utils.c:175
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:199
 msgid "All Files (*)"
 msgstr "Kaikki tiedostot (*)"
 
-#: ../shell/e-shell-view.c:304
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Tallennetaan käyttöliittymän tilaa"
 
 #. 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:642
+#: ../shell/e-shell-window-actions.c:74
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2002-2009\n"
@@ -19258,285 +20392,284 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
 "  papukaija https://launchpad.net/~papukaija";
 
-#: ../shell/e-shell-window-actions.c:653
+#: ../shell/e-shell-window-actions.c:85
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-actions.c:891
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:341
 msgid "Categories Editor"
-msgstr "Luokkalista"
+msgstr "Luokkamuokkain"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:672
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:673
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:881
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../shell/e-shell-window-actions.c:1486
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
-msgstr "Valittavat kentät"
+msgstr "Käytettävissä olevat _luokat"
 
-#: ../shell/e-shell-window-actions.c:1488
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
-msgstr "_Kopioi käytettäväksi yhteydettömässä tilassa"
+msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:944
 msgid "Show Evolution's shortcut keys"
 msgstr "Näytä Evolutionin pikanäppäimet"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:965
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:972
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:986
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:993
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "Lähetä _vikailmoitus..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1014
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1021
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "_Asettelu"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1184
 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:1750
-msgid "Define Views..."
-msgstr "Määrittele näkymät..."
-
-#: ../shell/e-shell-window-actions.c:1752
-msgid "Create or edit views"
-msgstr "Luo tai muokkaa näkymiä"
+#: ../shell/e-shell-window-actions.c:1192
+#| msgid "Save Current View"
+msgid "Delete Current View"
+msgstr "Poista nykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../shell/e-shell-window-actions.c:2178
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell-window-actions.c:2299
+#: ../shell/e-shell-window-actions.c:1714
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../shell/e-shell-window-actions.c:2400
+#: ../shell/e-shell-window-actions.c:1731
+#, c-format
+#| msgid "Select view: %s"
+msgid "Delete view: %s"
+msgstr "Poista näkymä: %s"
+
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
-#: ../shell/e-shell-window.c:497
+#: ../shell/e-shell-window.c:455
 msgid "New"
 msgstr "Uusi"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19572,7 +20705,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19580,61 +20713,65 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:216
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:307
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
+"Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat "
+"ovat 'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:317
-#, fuzzy
+#: ../shell/main.c:312
 msgid "Ignore network availability"
-msgstr "Onko verkko käytettävissä"
+msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../shell/main.c:319
-msgid "Start in \"express\" mode"
-msgstr "Käynnistä ”pikatilassa”"
-
-#: ../shell/main.c:322
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../shell/main.c:327
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../shell/main.c:331
+#: ../shell/main.c:324
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../shell/main.c:333
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../shell/main.c:517
+#: ../shell/main.c:403
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+
+#: ../shell/main.c:499 ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
-msgstr ", sähköposti- ja ajanhallintaohjelma"
+msgstr "- Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:571
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19643,7 +20780,7 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:577
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19688,70 +20825,7 @@ msgstr ""
 "Evolution ei enää tue päivittämistä suoraan versiosta {0}. Kiertokeinona "
 "voit kokeilla päivittää ensin Evolutionin versioon 2 ja sitten versioon 3."
 
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Tiedosto ei ole kelvollinen .desktop-tiedosto"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Tuntematon työpöytätiedoston versio \"%s\""
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Käynnistetään %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Ohjelma ei hyväksy asiakirjoja komentorivillä"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Tuntematon käynnistinvalitsin: %d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Asiakirja-URIa ei voi välittää \"Type-Link\"-työpöytälinkille"
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Kohde ei ole käynnistettävä"
-
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "Estä yhteys istunnonhallintaan"
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "Anna tallennetut asetukset sisältävä tiedosto"
-
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "TIEDOSTO"
-
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "Anna istunnonhallinnan tunniste"
-
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "TUNNISTE"
-
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "Istunnonhallinnan valitsimet:"
-
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "Näytä istunnonhallinnan valinnat"
-
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:109
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19762,114 +20836,181 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
 #, fuzzy
 msgid "Issued To Organization"
 msgstr "Organi_saatio:"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
 #, fuzzy
 msgid "Issued To Organizational Unit"
 msgstr "Organisaatioyksikkö (OU)"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:542
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "Käyttötarkoitus"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-viewer.c:640
 msgid "Issued By"
 msgstr "Myöntäjä"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
 #, fuzzy
 msgid "Issued By Organization"
 msgstr "Organi_saatio:"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
 #, fuzzy
 msgid "Issued By Organizational Unit"
 msgstr "Organisaatioyksikkö (OU)"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
 msgid "Issued"
-msgstr "Myöntäjä"
+msgstr "Myönnetty"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Vanhenemispäivä"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125 ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-viewer.c:650
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126 ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-viewer.c:651
 msgid "MD5 Fingerprint"
 msgstr "MD5-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-manager.c:589
+#: ../smime/gui/certificate-manager.c:614
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:602
+#: ../smime/gui/certificate-manager.c:628
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../smime/gui/certificate-manager.c:637
+#: ../smime/gui/certificate-manager.c:664
 msgid "Failed to import certificate"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../smime/gui/certificate-manager.c:1013
+#: ../smime/gui/certificate-manager.c:1046
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:1030
+#: ../smime/gui/certificate-manager.c:1063
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:1047
+#: ../smime/gui/certificate-manager.c:1080
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
-#: ../smime/gui/certificate-viewer.c:349
-#, c-format
-msgid "Certificate Viewer: %s"
-msgstr "Varmenteen katselin: %s"
+#: ../smime/gui/certificate-viewer.c:292
+#, fuzzy
+#| msgid "<Not Part of Certificate>"
+msgid "Not part of certificate"
+msgstr "<Ei varmenteen osa>"
+
+#: ../smime/gui/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr "Tämä varmenne on todennettu seuraaviin käyttötarkoituksiin:"
+
+#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
+msgid "SSL Client Certificate"
+msgstr "SSL-asiakkaan varmenne"
+
+#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
+msgid "SSL Server Certificate"
+msgstr "SSL-palvelimen varmenne"
+
+#: ../smime/gui/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr "Sähköpostin allekirjoittajan varmenne"
+
+#: ../smime/gui/certificate-viewer.c:619
+msgid "Email Recipient Certificate"
+msgstr "Sähköpostin vastaanottajan varmenne"
+
+#: ../smime/gui/certificate-viewer.c:634
+msgid "Issued To"
+msgstr "Myönnetty"
+
+#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr "Julkinen nimi (CN)"
+
+#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
+msgid "Organization (O)"
+msgstr "Organisaatio (O)"
+
+#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
+msgid "Organizational Unit (OU)"
+msgstr "Organisaatioyksikkö (OU)"
+
+#: ../smime/gui/certificate-viewer.c:645
+msgid "Validity"
+msgstr "Kelvollisuus"
+
+#: ../smime/gui/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "Myönnetty"
+
+#: ../smime/gui/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "Vanhenee"
+
+#: ../smime/gui/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "Sormenjäljet"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/certificate-viewer.c:671
+msgid "Certificate Hierarchy"
+msgstr "Varmennehierarkia"
+
+#: ../smime/gui/certificate-viewer.c:674
+msgid "Certificate Fields"
+msgstr "Varmenteen kentät"
+
+#: ../smime/gui/certificate-viewer.c:677
+msgid "Field Value"
+msgstr "Kentän arvo"
+
+#: ../smime/gui/certificate-viewer.c:679
+msgid "Details"
+msgstr "Yksityiskohtaiset"
+
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19878,7 +21019,7 @@ msgstr ""
 "Koska luotat varmentajaan, joka myönsi tämän varmenteen, luotat myös tämän "
 "varmenteen oikeellisuuteen, jollei tässä muuten mainita"
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19887,17 +21028,23 @@ 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/component.c:50
+#: ../smime/gui/component.c:56
+#, fuzzy, c-format
+#| msgid "Enter Google password for user '%s'."
+msgid "Enter the password for '%s', token '%s'"
+msgstr "Anna käyttäjän '%s' Google-salasana."
+
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr ""
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:76
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "Syötä uusi salasana varmennetietokannalle"
 
-#: ../smime/gui/component.c:79
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "Syötä uusi salasana"
 
@@ -19924,136 +21071,64 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Valitse varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
-msgid "SSL Client Certificate"
-msgstr "SSL-asiakkaan varmenne"
-
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
-msgid "SSL Server Certificate"
-msgstr "SSL-palvelimen varmenne"
-
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Email Signer Certificate"
-msgstr "Sähköpostin allekirjoittajan varmenne"
-
-#: ../smime/gui/smime-ui.ui.h:6
-msgid "Email Recipient Certificate"
-msgstr "Sähköpostin vastaanottajan varmenne"
-
-#: ../smime/gui/smime-ui.ui.h:7
-msgid "This certificate has been verified for the following uses:"
-msgstr "Tämä varmenne on todennettu seuraaviin käyttötarkoituksiin:"
-
-#: ../smime/gui/smime-ui.ui.h:8
-msgid "Issued To"
-msgstr "Myönnetty"
-
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Common Name (CN)"
-msgstr "Julkinen nimi (CN)"
-
-#: ../smime/gui/smime-ui.ui.h:10
-msgid "Organization (O)"
-msgstr "Organisaatio (O)"
-
-#: ../smime/gui/smime-ui.ui.h:11
-msgid "Organizational Unit (OU)"
-msgstr "Organisaatioyksikkö (OU)"
-
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Issued On"
-msgstr "Myönnetty"
-
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Expires On"
-msgstr "Vanhenee"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Fingerprints"
-msgstr "Sormenjäljet"
-
-#: ../smime/gui/smime-ui.ui.h:19
-msgid "<Not Part of Certificate>"
-msgstr "<Ei varmenteen osa>"
-
-#: ../smime/gui/smime-ui.ui.h:20
-msgid "Validity"
-msgstr "Kelvollisuus"
-
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "Certificate Hierarchy"
-msgstr "Varmennehierarkia"
-
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Certificate Fields"
-msgstr "Varmenteen kentät"
-
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Field Value"
-msgstr "Kentän arvo"
-
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Yksityiskohtaiset"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Seuraavien organisaatioiden varmenteet varmentavat identiteettisi:"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Certificates Table"
 msgstr "Varmennetaulu"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "_Backup"
 msgstr "_Varmuuskopioi"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Backup _All"
 msgstr "Varmuuskopioi _kaikki"
 
-#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Your Certificates"
 msgstr "Omat varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "You have certificates on file that identify these people:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Tuttavien varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "Varmentajat"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:16
 #, fuzzy
 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:17
 #, fuzzy
 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:41
+#: ../smime/gui/smime-ui.ui.h:18
 #, fuzzy
 msgid "Trust this CA to identify _software developers."
 msgstr "Luota tähän CA:han ohjelmistokehittäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:19
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20061,177 +21136,164 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
 msgid "Certificate"
 msgstr "Varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Certificate details"
 msgstr "Varmenteen yksityiskohdat"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "Varmenteen luottamuksen asetukset"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Trust the authenticity of this certificate"
 msgstr "Luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Älä luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
-msgid "%d/%m/%Y"
-msgstr "%d.%m.%Y"
-
-#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:390
-msgid "Sign"
-msgstr "Allekirjoita"
-
-#: ../smime/lib/e-cert.c:391
-msgid "Encrypt"
-msgstr "Salaa"
-
-#: ../smime/lib/e-cert.c:503
+#: ../smime/lib/e-asn1-object.c:95
 msgid "Version"
 msgstr "Versio"
 
-#: ../smime/lib/e-cert.c:518
+#: ../smime/lib/e-asn1-object.c:110
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../smime/lib/e-cert.c:521
+#: ../smime/lib/e-asn1-object.c:113
 msgid "Version 2"
 msgstr "Versio 2"
 
-#: ../smime/lib/e-cert.c:524
+#: ../smime/lib/e-asn1-object.c:116
 msgid "Version 3"
 msgstr "Versio 3"
 
-#: ../smime/lib/e-cert.c:607
+#: ../smime/lib/e-asn1-object.c:192
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA -salauksella"
 
-#: ../smime/lib/e-cert.c:610
+#: ../smime/lib/e-asn1-object.c:195
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA -salauksella"
 
-#: ../smime/lib/e-cert.c:613
+#: ../smime/lib/e-asn1-object.c:198
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA -salauksella"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-asn1-object.c:201
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 RSA -salauksella"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-asn1-object.c:204
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 RSA -salauksella"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-asn1-object.c:207
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 RSA -salauksella"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-asn1-object.c:234
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-salaus"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-asn1-object.c:237
 msgid "Certificate Key Usage"
 msgstr "Varmenneavaimen käyttö"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-asn1-object.c:240
 msgid "Netscape Certificate Type"
 msgstr "Netscape-varmenteen tyyppi"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-asn1-object.c:243
 msgid "Certificate Authority Key Identifier"
 msgstr "Varmentajan avaintunniste"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-asn1-object.c:255
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Kohteen tunniste (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-asn1-object.c:306
 msgid "Algorithm Identifier"
 msgstr "Algoritmin tunniste"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-asn1-object.c:314
 msgid "Algorithm Parameters"
 msgstr "Algoritmin parametrit"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-asn1-object.c:336
 msgid "Subject Public Key Info"
 msgstr "Aiheen julkisen avaimen tiedot"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-asn1-object.c:341
 msgid "Subject Public Key Algorithm"
 msgstr "Aiheen julkisen avaimen algoritmi"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-asn1-object.c:356
 msgid "Subject's Public Key"
 msgstr "Kohteen julkinen avain"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
 msgid "Error: Unable to process extension"
 msgstr "Virhe: laajennosta ei voi käsitellä"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
 msgid "Object Signer"
 msgstr "Kohteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-asn1-object.c:403
 msgid "SSL Certificate Authority"
 msgstr "SSL-varmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-asn1-object.c:407
 msgid "Email Certificate Authority"
 msgstr "Sähköpostivarmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:851
+#: ../smime/lib/e-asn1-object.c:436
 msgid "Signing"
 msgstr "Allekirjoitus"
 
-#: ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-asn1-object.c:440
 msgid "Non-repudiation"
 msgstr "Kiistämättömyys"
 
-#: ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-asn1-object.c:444
 msgid "Key Encipherment"
 msgstr "Avaimen salakoodaus"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-asn1-object.c:448
 msgid "Data Encipherment"
 msgstr "Tiedon salakoodaus"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-asn1-object.c:452
 msgid "Key Agreement"
 msgstr "Avaimen sopimus"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-asn1-object.c:456
 msgid "Certificate Signer"
 msgstr "Varmenteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-asn1-object.c:460
 msgid "CRL Signer"
 msgstr "CRL allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:924
+#: ../smime/lib/e-asn1-object.c:509
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
+#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
 msgid "Not Critical"
 msgstr "Ei-kriittinen"
 
-#: ../smime/lib/e-cert.c:950
+#: ../smime/lib/e-asn1-object.c:535
 msgid "Extensions"
 msgstr "Laajennokset"
 
@@ -20243,40 +21305,53 @@ msgstr "Laajennokset"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1029
+#: ../smime/lib/e-asn1-object.c:615
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
 msgid "Certificate Signature Algorithm"
 msgstr "Varmenteen allekirjoitusalgoritmi"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-asn1-object.c:681
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-asn1-object.c:735
 msgid "Issuer Unique ID"
 msgstr "Myöntäjän yksilöllinen ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-asn1-object.c:754
 msgid "Subject Unique ID"
 msgstr "Kohteen yksilöllinen tunniste"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-asn1-object.c:813
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
-#: ../smime/lib/e-cert-db.c:860
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:392
+msgid "Sign"
+msgstr "Allekirjoita"
+
+#: ../smime/lib/e-cert.c:393
+msgid "Encrypt"
+msgstr "Salaa"
+
+#: ../smime/lib/e-cert-db.c:864
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "PKCS12-tiedoston salasana"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "Syötä salasana PKCS12-tiedostolle:"
 
@@ -20356,1231 +21431,490 @@ msgstr "_Eräpäivän kanssa"
 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:202
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:416
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
-msgid "UTC"
-msgstr "UTC"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Valitse aikavyöhyke"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Lähennä kartalla vasemmalla hiiren napilla haluamallesi alueelle ja valitse "
-"aikavyöhyke.\n"
-"Loitonna kartalla oikealla hiiren napilla."
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "Aikavyöhykkeet"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "_Valinta"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "Aikavyöhykkeen valinnan pudotusvalikko"
-
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../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:372
-#: ../widgets/menus/gal-define-views-dialog.c:374
-msgid "Define Views"
-msgstr "Määrittele näkymät"
-
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Määrittele %s näkymät"
-
-#: ../widgets/menus/gal-view-factory-etable.c:115
-msgid "Table"
-msgstr "Taulu"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
-msgid "Save Current View"
-msgstr "Tallenna nykyinen näkymä"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "Luo uusi _näkymä"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Korvaa olemassaoleva näkymä"
-
-#: ../widgets/menus/gal-view-new-dialog.c:172
-msgid "Define New View"
-msgstr "Määrittele uusi näkymä"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Uuden näkymän nimi:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "Näkymän tyyppi:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "Näkymän tyyppi"
-
-#: ../widgets/misc/ea-calendar-item.c:308
-#: ../widgets/misc/ea-calendar-item.c:317
-msgid "%d %B %Y"
-msgstr "%d. %Bta %Y"
-
-#: ../widgets/misc/ea-calendar-item.c:320
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalenteri väliltä %s - %s"
-
-#: ../widgets/misc/ea-calendar-item.c:356
-msgid "evolution calendar item"
-msgstr "evolutionin kalenterin kohta"
-
-#: ../widgets/misc/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "Sulje tämä viesti"
-
-#: ../widgets/misc/e-attachment-bar.c:658
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Kuvakenäkymä"
-
-#: ../widgets/misc/e-attachment-bar.c:660
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "Luettelonäkymä"
-
-#. To Translators: This text is set as a description of an attached
-#. * 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:979
-msgid "Attached message"
-msgstr "Liitetty viesti"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1842 ../widgets/misc/e-attachment.c:2397
-#: ../widgets/misc/e-attachment-store.c:525
-msgid "attachment.dat"
-msgstr "liite.dat"
-
-#: ../widgets/misc/e-attachment.c:1887 ../widgets/misc/e-attachment.c:2699
-msgid "A load operation is already in progress"
-msgstr "Lataus on jo käynnissä"
-
-#: ../widgets/misc/e-attachment.c:1895 ../widgets/misc/e-attachment.c:2707
-msgid "A save operation is already in progress"
-msgstr "Tallennus on jo käynnissä"
-
-#: ../widgets/misc/e-attachment.c:2002
-#, c-format
-msgid "Could not load '%s'"
-msgstr "%s ei voitu ladata"
-
-#: ../widgets/misc/e-attachment.c:2005
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Liitettä ei voitu avata"
-
-#: ../widgets/misc/e-attachment.c:2278
-#, c-format
-msgid "Could not open '%s'"
-msgstr "%s ei voitu avata"
-
-#: ../widgets/misc/e-attachment.c:2281
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Liitettä ei voitu avata"
-
-#: ../widgets/misc/e-attachment.c:2715
-msgid "Attachment contents not loaded"
-msgstr "Liitteen sisältöä ei ladattu"
-
-#: ../widgets/misc/e-attachment.c:2791
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
-
-#: ../widgets/misc/e-attachment.c:2794
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Liitettä ei voitu tallentaa"
-
-#: ../widgets/misc/e-attachment-dialog.c:311
-msgid "Attachment Properties"
-msgstr "Liitteen ominaisuudet"
+#~ msgid "Card View"
+#~ msgstr "Korttinäkymä"
 
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "_Tiedostonimi:"
+#~ msgid "Export in asynchronous mode"
+#~ msgstr "Vie asynkronisesti"
 
-#: ../widgets/misc/e-attachment-dialog.c:368
-msgid "MIME Type:"
-msgstr "MIME-tyyppi:"
+#~ msgid ""
+#~ "The number of cards in one output file in asynchronous mode, default size "
+#~ "100."
+#~ msgstr ""
+#~ "Yhden tulostiedoston sisältämien korttien lukumäärä käytettäessä "
+#~ "asynkronista tilaa. Oletusarvo on 100."
 
-#: ../widgets/misc/e-attachment-dialog.c:376
-#: ../widgets/misc/e-attachment-store.c:442
-msgid "_Suggest automatic display of attachment"
-msgstr "_Ehdota liitteen automaattista näyttämistä"
+#~ msgid "NUMBER"
+#~ msgstr "NUMERO"
 
-#: ../widgets/misc/e-attachment-handler-image.c:99
-msgid "Could not set as background"
-msgstr "Ei voitu asettaa taustakuvaksi"
+#~ msgid "In async mode, output must be file."
+#~ msgstr "Asynkronisessa tilassa ulostulon täytyy olla tiedosto."
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
-msgid "Set as _Background"
-msgstr "Aseta _taustakuvaksi"
+#~ msgid "In normal mode, there is no need for the size option."
+#~ msgstr "Normaalitilassa kokoa ei pitäisi tarvita antaa."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-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ää"
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolution ei vielä tue kalenterin muistutuksia, joissa on\n"
+#~ "sähköpostihuomautus, mutta tämä muistutus oli määritelty\n"
+#~ "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
+#~ "tavallisen huomautusikkunan."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Lähetä..."
+#~ msgid "The Evolution tasks have quit unexpectedly."
+#~ msgstr "Evolutionin tehtäväkomponentti on sulkeutunut odottamatta."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "Lähetä valitut liitteet jonnekin"
+#~ 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."
 
-#: ../widgets/misc/e-attachment-icon-view.c:166
-#: ../widgets/misc/e-attachment-tree-view.c:549
-msgid "Loading"
-msgstr "Ladataan"
+#~ msgid "The Evolution memo has quit unexpectedly."
+#~ msgstr "Evolutionin muistilappuosa sulkeutui odottamatta."
 
-#: ../widgets/misc/e-attachment-icon-view.c:178
-#: ../widgets/misc/e-attachment-tree-view.c:561
-msgid "Saving"
-msgstr "Tallennetaan"
+#~ msgid "The Evolution calendars have quit unexpectedly."
+#~ msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../widgets/misc/e-attachment-paned.c:104
-msgid "Hide Attachment _Bar"
-msgstr "Piilota _liitepalkki"
+#~ msgid "Delete remote calendar &quot;{0}&quot;?"
+#~ msgstr "Poistetaanko etäkalenteri &quot;{0}&quot;?"
 
-#: ../widgets/misc/e-attachment-paned.c:106
-#: ../widgets/misc/e-attachment-paned.c:719
-msgid "Show Attachment _Bar"
-msgstr "Näytä _liitepalkki"
+#~| msgid "Delete task list '{0}'?"
+#~ msgid "Delete remote task list &quot;{0}&quot;?"
+#~ msgstr "Poistetaanko tehtävälista &quot;{0}&quot;?"
 
-#: ../widgets/misc/e-attachment-store.c:430
-msgid "Add Attachment"
-msgstr "Lisää liite"
+#~ msgid "Delete remote memo list &quot;{0}&quot;?"
+#~ msgstr "Poistetaanko muistiolista &quot;{0}&quot;?"
 
-#: ../widgets/misc/e-attachment-store.c:433
-msgid "A_ttach"
-msgstr "Lii_tä"
+#~ msgid "Cannot create a new event"
+#~ msgstr "Uutta tapahtumaa ei voi luoda"
 
-#: ../widgets/misc/e-attachment-store.c:496
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "Tallenna liite"
-msgstr[1] "Tallenna liitteet"
-
-#: ../widgets/misc/e-attachment-view.c:379
-msgid "Open With Other Application..."
-msgstr "Avaa tois_ella sovelluksella..."
-
-#: ../widgets/misc/e-attachment-view.c:386
-msgid "S_ave All"
-msgstr "Tallenna _kaikki"
-
-#: ../widgets/misc/e-attachment-view.c:412
-msgid "A_dd Attachment..."
-msgstr "_Lisää liite..."
+#~ msgid ""
+#~ "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#~ "different calendar from the side bar in the Calendar view."
+#~ msgstr ""
+#~ "\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. "
+#~ "Valitse joku toinen kalenteri kalenterinäkymän sivupalkista."
 
-#: ../widgets/misc/e-attachment-view.c:436
-msgid "_Hide"
-msgstr "_Piilota"
+#~ msgid "Error on {0}: {1}"
+#~ msgstr "Virhe kohteessa {0}: {1}"
 
-#: ../widgets/misc/e-attachment-view.c:443
-msgid "Hid_e All"
-msgstr "_Piilota kaikki"
+#~| msgid "Could not open destination"
+#~ msgid "Could not perform this operation."
+#~ msgstr "Toimenpiteen suoritus epäonnistui."
 
-#: ../widgets/misc/e-attachment-view.c:450
-msgid "_View Inline"
-msgstr "Näytä _sisäkkäisesti"
+#~ msgid "Day View"
+#~ msgstr "Päivänäkymä"
 
-#: ../widgets/misc/e-attachment-view.c:457
-msgid "Vie_w All Inline"
-msgstr "_Näytä kaikki sisäkkäisesti"
+#~ msgid "Work Week View"
+#~ msgstr "Työviikon näkymä"
 
-#: ../widgets/misc/e-attachment-view.c:778
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Avaa sovelluksella \"%s\""
+#~ msgid "Week View"
+#~ msgstr "Työviikko"
 
-#: ../widgets/misc/e-attachment-view.c:781
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Avaa tämä liite ohjelmalla %s"
+#~ msgid "Month View"
+#~ msgstr "Kuukausinäkymä"
 
-#: ../widgets/misc/e-book-source-config.c:98
-#| msgid "Mark as _default address book"
-msgid "Mark as default address book"
-msgstr "Merkitse oletusosoitekirjaksi"
+#~ msgid "Unable to open the calendar '%s': %s"
+#~ msgstr "Kalenterin '%s' avaus ei onnistu: %s"
 
-#: ../widgets/misc/e-book-source-config.c:103
 #, fuzzy
-#| msgid "A_utocomplete with this address book"
-msgid "Autocomplete with this address book"
-msgstr "_Täydennä automaattisesti tästä osoitekirjasta"
+#~ msgid "Unable to open memos in '%s': %s"
+#~ msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../widgets/misc/e-book-source-config.c:277
-#, fuzzy
-#| msgid "Copy _book content locally for offline operation"
-msgid "Copy book content locally for offline operation"
-msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
+#~ msgid "Web Page"
+#~ msgstr "WWW-sivu"
 
-#. 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:389
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl-napsauta avataksesi linkin"
-
-#: ../widgets/misc/e-calendar.c:187
-#| msgid "Previous"
-msgid "Previous month"
-msgstr "Edellinen kuukausi"
+#~ msgid "Stat_us:"
+#~ msgstr "_Tila:"
 
-#: ../widgets/misc/e-calendar.c:211
-msgid "Next month"
-msgstr "Seuraava kuukausi"
-
-#: ../widgets/misc/e-calendar.c:233
-#| msgid "Previous"
-msgid "Previous year"
-msgstr "Edellinen vuosi"
+#~ msgid "_Status Details"
+#~ msgstr "_Tilan yksityiskohdat"
 
-#: ../widgets/misc/e-calendar.c:254
-msgid "Next year"
-msgstr "Seuraava vuosi"
-
-#: ../widgets/misc/e-calendar.c:278
-msgid "Month Calendar"
-msgstr "Kuukausikalenteri"
-
-#. This is a strftime() format. %B = Month name.
-#: ../widgets/misc/e-calendar-item.c:1283
-#: ../widgets/misc/e-calendar-item.c:2136
-msgctxt "CalItem"
-msgid "%B"
-msgstr ""
+#~ 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"
 
-#. This is a strftime() format. %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1285
-msgctxt "CalItem"
-msgid "%Y"
-msgstr ""
+#~ msgid "Task Details"
+#~ msgstr "Tehtävän yksityiskohdat"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1322
 #, fuzzy
-#| msgid "%B %Y"
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "Unable to open tasks in '%s': %s"
+#~ msgstr "Tehtäviä kohteesta '%s' ei voi avata."
 
-#: ../widgets/misc/e-cal-source-config.c:170
-#| msgid "Mark as _default calendar"
-msgid "Mark as default calendar"
-msgstr "Merkitse oletuskalenteriksi"
+#~ msgid "Opening %s"
+#~ msgstr "Avataan %s"
 
-#: ../widgets/misc/e-cal-source-config.c:173
-#| msgid "Mark as _default task list"
-msgid "Mark as default task list"
-msgstr "Merkitse oletustehtävälistaksi"
+#~ msgid "Save draft"
+#~ msgstr "Tallenna luonnos"
 
-#: ../widgets/misc/e-cal-source-config.c:176
-#| msgid "Mark as _default memo list"
-msgid "Mark as default memo list"
-msgstr "Merkitse oletusmuistiolistaksi"
+#~ msgid "Email Settings"
+#~ msgstr "Sähköpostin asetukset"
 
-#: ../widgets/misc/e-cal-source-config.c:201
-#| msgid "Colo_r:"
-msgid "Color:"
-msgstr "Väri:"
+#~ msgid "Configure email accounts"
+#~ msgstr "Tee sähköpostitilien asetukset"
 
-#: ../widgets/misc/e-cal-source-config.c:406
-#, fuzzy
-#| msgid "Cop_y calendar contents locally for offline operation"
-msgid "Copy calendar contents locally for offline operation"
-msgstr "_Kopioi kalenterin sisältö paikallisesti yhteydettömään käyttöön"
+#~ msgid "Week start"
+#~ msgstr "Viikon alku"
 
-#: ../widgets/misc/e-cal-source-config.c:410
-#, fuzzy
-#| msgid "Cop_y task list contents locally for offline operation"
-msgid "Copy task list contents locally for offline operation"
-msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
+#~ msgid "Work days"
+#~ msgstr "Työpäivät"
 
-#: ../widgets/misc/e-cal-source-config.c:414
 #, fuzzy
-#| msgid "Cop_y memo list contents locally for offline operation"
-msgid "Copy memo list contents locally for offline operation"
-msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
-
-#: ../widgets/misc/e-charset-combo-box.c:100
-msgid "Character Encoding"
-msgstr "Merkistön koodaus"
-
-#: ../widgets/misc/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "Syötä käytettävä merkistö"
-
-#: ../widgets/misc/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "Muut..."
-
-#: ../widgets/misc/e-contact-map-window.c:356
-msgid "Contacts Map"
-msgstr "Yhteystietokartta"
-
-#: ../widgets/misc/e-dateedit.c:504
-msgid "Date and Time"
-msgstr "Päiväys ja aika"
-
-#: ../widgets/misc/e-dateedit.c:525
-msgid "Text entry to input date"
-msgstr "Tekstikenttä päiväyksen syöttöön"
-
-#: ../widgets/misc/e-dateedit.c:547
-msgid "Click this button to show a calendar"
-msgstr "Paina tästä näyttääksesi kalenterin"
-
-#: ../widgets/misc/e-dateedit.c:594
-msgid "Drop-down combination box to select time"
-msgstr "Yhdistelmävalitsin ajan valitsemiseen"
-
-#: ../widgets/misc/e-dateedit.c:666
-msgid "No_w"
-msgstr "N_yt"
-
-#: ../widgets/misc/e-dateedit.c:673
-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:682
-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:1697 ../widgets/misc/e-dateedit.c:1930
-msgctxt "date"
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../widgets/misc/e-dateedit.c:1824
-msgid "Invalid Date Value"
-msgstr "Virheellinen päivämäärä"
-
-#: ../widgets/misc/e-dateedit.c:1868
-msgid "Invalid Time Value"
-msgstr "Virheellinen ajan kuvaus"
-
-#: ../widgets/misc/e-import-assistant.c:256
-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:283
-msgid "Select a file"
-msgstr "Valitse tiedosto"
-
-#: ../widgets/misc/e-import-assistant.c:297
-#: ../widgets/misc/e-import-assistant.c:472
-msgid "File _type:"
-msgstr "Tiedoston _tyyppi:"
-
-#: ../widgets/misc/e-import-assistant.c:340
-#: ../widgets/misc/e-import-assistant.c:920
-msgid "Choose the destination for this import"
-msgstr "Valitse tämän tuonnin kohde"
-
-#: ../widgets/misc/e-import-assistant.c:365
-msgid "Choose the type of importer to run:"
-msgstr "Valitse suoritettavan tuojan tyyppi:"
-
-#: ../widgets/misc/e-import-assistant.c:373
-msgid "Import data and settings from _older programs"
-msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
-
-#: ../widgets/misc/e-import-assistant.c:381
-msgid "Import a _single file"
-msgstr "Tuo _yksi tiedosto"
-
-#: ../widgets/misc/e-import-assistant.c:533
-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:775
-msgid "_Cancel Import"
-msgstr "_Peru tuonti"
-
-#: ../widgets/misc/e-import-assistant.c:919
-msgid "Preview data to be imported"
-msgstr "Esikatsele tuotavia tietoja"
-
-#: ../widgets/misc/e-import-assistant.c:925
-#: ../widgets/misc/e-import-assistant.c:938
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1367
-#: ../widgets/misc/e-import-assistant.c:1376
-msgid "Import Data"
-msgstr "Tuo tiedot"
-
-#: ../widgets/misc/e-import-assistant.c:933
-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:1281
-#: ../widgets/misc/e-import-assistant.c:1316
-msgid "Evolution Import Assistant"
-msgstr "Evolutionin tuontiapulainen"
-
-#: ../widgets/misc/e-import-assistant.c:1298
-#: ../widgets/misc/e-import-assistant.c:1354
-msgid "Import Location"
-msgstr "Tuo sijainti"
-
-#: ../widgets/misc/e-import-assistant.c:1309
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-"Tervetuloa Evolutionin tuontiapulaiseen.\n"
-"Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
-"Evolutionin käyttöön."
-
-#: ../widgets/misc/e-import-assistant.c:1326
-msgid "Importer Type"
-msgstr "Tuojan tyyppi"
-
-#: ../widgets/misc/e-import-assistant.c:1336
-msgid "Select Information to Import"
-msgstr "Valitse tuotavat tiedot"
-
-#: ../widgets/misc/e-import-assistant.c:1345
-msgid "Select a File"
-msgstr "Valitse tiedosto"
-
-#: ../widgets/misc/e-import-assistant.c:1362
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
-
-#: ../widgets/misc/e-mail-signature-combo-box.c:378
-msgid "Autogenerated"
-msgstr "Automaattisesti luotu"
-
-#: ../widgets/misc/e-mail-signature-editor.c:287
-#| msgid "_Close"
-msgid "Close"
-msgstr "Sulje"
-
-#: ../widgets/misc/e-mail-signature-editor.c:292
-msgid "_Save and Close"
-msgstr "_Tallenna ja sulje"
-
-#: ../widgets/misc/e-mail-signature-editor.c:506
-msgid "Edit Signature"
-msgstr "Muokkaa allekirjoitusta"
-
-#: ../widgets/misc/e-mail-signature-editor.c:526
-msgid "_Signature Name:"
-msgstr "Allekirjoituk_sen nimi:"
-
-#: ../widgets/misc/e-mail-signature-editor.c:572
-msgid "Unnamed"
-msgstr "Nimeämätön"
-
-#: ../widgets/misc/e-mail-signature-manager.c:337
-msgid "Add _Script"
-msgstr "Lisää _skripti"
-
-#: ../widgets/misc/e-mail-signature-manager.c:421
-msgid "Add Signature Script"
-msgstr "Lisää allekirjoitus-skripti"
+#~ msgid "Days on which the start and end of work hours should be indicated"
+#~ msgstr "Päivät, joina työtuntien alku ja loppu näytetään kalenterissa."
 
-#: ../widgets/misc/e-mail-signature-manager.c:491
-msgid "Edit Signature Script"
-msgstr "Muokkaa allekirjoitus-skriptiä"
+#~ msgid "Whether disable ellipsizing feature of folder names in side bar."
+#~ msgstr "Onko kansionimien typistys sivupalkissa poistettu käytöstä."
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:395
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"Tämän komennon tulostetta käytetään allekirjoituksenasi. \n"
-"Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
-"näytettäessä."
+#~ 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 "
+#~ "contacts. \"2\" - Always load images off the net."
+#~ msgstr ""
+#~ "Lataa HTML-viestien kuvia HTTP(S):n yli. Mahdolliset arvot ovat: \"0\" - "
+#~ "älä koskaan lataa kuvia verkosta, \"1\" - lataa kuvat, jos lähettäjä on "
+#~ "osoitekirjassa ja \"2\" - lataa kuvat aina verkosta."
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:446
-msgid "S_cript:"
-msgstr "_Skripti:"
+#~ 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 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ä."
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:477
-msgid "Script file must be executable."
-msgstr "Skriptitiedoston tulee olla suoritettavissa."
+#~ msgid "Search for the sender photo in local address books"
+#~ msgstr "Etsi lähettäjän valokuvaa paikallisista osoitekirjoista"
 
-#: ../widgets/misc/e-map.c:886
-msgid "World Map"
-msgstr "Maailmankartta"
+#~ msgid "This option would help in improving the speed of fetching."
+#~ msgstr "Tämä ominaisuus helpottaa noudon nopeuden parantamista."
 
-#: ../widgets/misc/e-map.c:889
-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 alla olevasta pudotusvalikosta."
+#~ msgid "List of MIME types to check for Bonobo component viewers"
+#~ msgstr ""
+#~ "Luettelo MIME-tyypeistä, joista etsitään Bonobo-komponenttikatselimia"
 
-#: ../widgets/misc/e-online-button.c:31
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
+#~ 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 in GNOME's MIME type database may be used for displaying "
+#~ "content."
+#~ msgstr ""
+#~ "Jos jollekin MIME-tyypille ei ole sisäänrakennettua katselinta "
+#~ "Evolutionissa, voidaan käyttää mitä tahansa Gnomen MIME-"
+#~ "tyyppientietokannassa määriteltyä bonobo-komponentin katselinta viestin "
+#~ "näyttämiseen."
 
-#: ../widgets/misc/e-online-button.c:34
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
+#~ msgid "Use SpamAssassin daemon and client"
+#~ msgstr "Käytä Spamassassin-palvelinta ja -asiakasta"
 
-#: ../widgets/misc/e-online-button.c:37
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
+#~ msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+#~ msgstr "Käytä Spamassassin-palvelinta ja -asiakasta (spamc/spamd)."
 
-#: ../widgets/misc/e-preferences-window.c:317
-msgid "Evolution Preferences"
-msgstr "Evolutionin asetukset"
+#~ msgid "SpamAssassin client binary"
+#~ msgstr "Spamassassin-ohjelman binääri"
 
-#: ../widgets/misc/e-search-bar.c:79
-#, c-format
-#| msgid "Matches: %d"
-msgid "Matches: %u"
-msgstr "Osumia: %u"
+#~ msgid "SpamAssassin daemon binary"
+#~ msgstr "Spamassassin-taustapalvelun binääri"
 
-#: ../widgets/misc/e-search-bar.c:527
-msgid "Close the find bar"
-msgstr "Sulje hakupalkki"
+#, fuzzy
+#~| msgid "Error removing list"
+#~ msgid "Error resolving '%s'"
+#~ msgstr "Virhe poistettaessa listaa"
 
-#: ../widgets/misc/e-search-bar.c:535
-msgid "Fin_d:"
-msgstr "Et_si:"
+#~ msgid "Unable to create local mail folders at '%s': %s"
+#~ msgstr "Ei voida luoda paikallisia sähköpostikansioita kohteeseen ”%s”: %s"
 
-#: ../widgets/misc/e-search-bar.c:547
-msgid "Clear the search"
-msgstr "Tyhjennä hakukenttä"
+#~ msgid "Please select a folder"
+#~ msgstr "Valitse kansio"
 
-#: ../widgets/misc/e-search-bar.c:571
-msgid "_Previous"
-msgstr "_Edellinen"
+#~ msgid "_Switch to Folder"
+#~ msgstr "_Vaihda kansioon"
 
-#: ../widgets/misc/e-search-bar.c:577
-msgid "Find the previous occurrence of the phrase"
-msgstr "Etsi lauseen edellinen esiintymä"
+#~ msgid "Display the parent folder"
+#~ msgstr "Näytä ylemmän tason kansio"
 
-#: ../widgets/misc/e-search-bar.c:590
-msgid "_Next"
-msgstr "_Seuraava"
+#~ msgid "Switch to _next tab"
+#~ msgstr "Siirry _seuraavaan välilehteen"
 
-#: ../widgets/misc/e-search-bar.c:596
-msgid "Find the next occurrence of the phrase"
-msgstr "Etsi lauseen seuraava esiintymä"
+#~ msgid "Switch to the next tab"
+#~ msgstr "Siirry seuraavaan välilehteen"
 
-#: ../widgets/misc/e-search-bar.c:609
-msgid "Mat_ch case"
-msgstr "Huomioi _kirjainkoko"
+#~ msgid "Switch to _previous tab"
+#~ msgstr "Siirry _edelliseen välilehteen"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "Reached bottom of page, continued from top"
-msgstr "Saavutettiin sivun loppu, jatketaan alusta"
+#~ msgid "Switch to the previous tab"
+#~ msgstr "Siirry edelliseen välilehteen"
 
-#: ../widgets/misc/e-search-bar.c:659
-msgid "Reached top of page, continued from bottom"
-msgstr "Saavutettiin sivun alku, jatketaan lopusta"
+#~ msgid "Cl_ose current tab"
+#~ msgstr "_Sulje nykyinen välilehti"
 
-#: ../widgets/misc/e-send-options.c:570
-msgid "When de_leted:"
-msgstr "Milloin _poistettu:"
+#~ msgid "Close current tab"
+#~ msgstr "Sulje nykyinen välilehti"
 
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Tavallinen"
+#~ msgid "Folder '%s'"
+#~ msgstr "Kansio ”%s”"
 
-#: ../widgets/misc/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr ""
+#, fuzzy
+#~| msgid "Failed to load the calendar '%s' (%s)"
+#~ msgid "Failed to load part '%s'"
+#~ msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
-#: ../widgets/misc/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Salainen"
+#~ msgid "S_earch for sender photograph only in local address books"
+#~ msgstr "Et_si lähettäjän valokuvaa vain paikallisista osoitekirjoista"
 
-#: ../widgets/misc/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Erittäin salainen"
+#~ msgid "Cannot open source \"{1}\"."
+#~ msgstr "Lähdettä \"{1}\" ei voi avata."
 
-#: ../widgets/misc/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Vain sinulle"
+#~ msgid ""
+#~ "This will mark all messages as read in the selected folder and its "
+#~ "subfolders."
+#~ msgstr ""
+#~ "Tämä toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
+#~ "alikansioissa luetuiksi."
 
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Ei mitään"
+#~ msgid "Close message window."
+#~ msgstr "Sulje viesti-ikkuna."
 
-#: ../widgets/misc/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Sähköpostin vastaanotto"
+#~ msgid "Would you like to close the message window?"
+#~ msgstr "Haluatko sulkea viesti-ikkunan?"
 
-#: ../widgets/misc/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "V_astausta pyydetty"
+#~ msgid "Sent Messages"
+#~ msgstr "Lähetetyt viestit"
 
-#: ../widgets/misc/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "S_isällä"
+#~ msgid "Anonymously"
+#~ msgstr "Anonyymisti"
 
-#: ../widgets/misc/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "päivää"
+#~ msgid "One"
+#~ msgstr "Yksi"
 
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "Milloin _sopii"
+#~ msgid "Sub"
+#~ msgstr "Ali"
 
-#: ../widgets/misc/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Viivästä viestin toimitusta"
+#~ msgid "Supported Search Bases"
+#~ msgstr "Tuetut hakupohjat"
 
-#: ../widgets/misc/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Jälkeen"
+#~ msgid "Ser_ver:"
+#~ msgstr "_Palvelin:"
 
-#: ../widgets/misc/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "päivää"
+#~ msgid "Use secure _connection:"
+#~ msgstr "_Käytä salattua yhteyttä:"
 
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "Aseta _eräpäivä"
+#~ msgid "_Login method:"
+#~ msgstr "_Kirjautumismenetelmä:"
 
-#: ../widgets/misc/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Kunnes"
+#~ msgid "Lo_gin:"
+#~ msgstr "_Kirjautuminen:"
 
-#: ../widgets/misc/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Toimitusvalinnat"
+#~ msgid "Search _base:"
+#~ msgstr "Haku_pohja:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "Lu_okittelu:"
+#~ msgid "_Search scope:"
+#~ msgstr "_Hakualue:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "_Yleisasetukset"
+#~ msgid "_Find Possible Search Bases"
+#~ msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "_Luo lähetyskohde, jonka tietoja seurataan"
+#, fuzzy
+#~ msgid "S_earch filter:"
+#~ msgstr "Haku_suodatin:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Toimitettu"
+#~ msgid "Search Filter"
+#~ msgstr "Hakusuodatin"
 
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "_Toimitettu ja avattu"
+#~ 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\"."
+#~ msgstr ""
+#~ "Hakusuodatin määrittää etsittävien kohteiden tyypin hakua varten. Jos "
+#~ "asetusta ei muuteta, etsitään oletuksena \"person\"-tyypin kohderyhmästä."
 
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Kaikki tiedot"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "Poista lähetetty _automaattisesti"
+#~ msgid "5"
+#~ msgstr "5"
 
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Tilan seuranta"
+#~ msgid "_Timeout:"
+#~ msgstr "_Aikakatkaisu:"
 
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Milloin avattu:"
+#~ msgid "_Download limit:"
+#~ msgstr "_Haun rajoitus:"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Milloin h_ylätty:"
+#~ msgid "B_rowse this book until limit reached"
+#~ msgstr "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
 
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Milloin val_mistuu:"
+#~| msgid "_Path:"
+#~ msgid "Path:"
+#~ msgstr "Polku:"
 
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Milloin hy_väksytty:"
+#~ msgid "Loading calendars"
+#~ msgstr "Ladataan kalentereita"
 
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "_Tilan seuranta"
-
-#: ../widgets/misc/e-source-config.c:680 ../widgets/misc/e-source-config.c:684
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: ../widgets/misc/e-source-config.c:692 ../widgets/misc/e-source-config.c:696
-msgid "Name:"
-msgstr "Nimi:"
+#~ msgid "Loading memos"
+#~ msgstr "Ladataan muistilappuja"
 
-#. Translators: This is the first of a sequence of widgets:
-#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1294
-#| msgid "Refresh the folder"
-msgid "Refresh every"
-msgstr "Päivitysväli"
+#~ msgid "Loading tasks"
+#~ msgstr "Ladataan tehtäviä"
 
-#: ../widgets/misc/e-source-config.c:1324
-#: ../widgets/misc/e-source-config.c:1352
-msgid "Use a secure connection"
-msgstr "Käytä salattua yhteyttä:"
+#~ msgid "_Fetch All Headers"
+#~ msgstr "Nouda _kaikki otsakkeet"
 
-#: ../widgets/misc/e-source-config.c:1366
 #, fuzzy
-#| msgid "Imported Certificate"
-msgid "Ignore invalid SSL certificate"
-msgstr "Tuotu varmenne"
-
-#: ../widgets/misc/e-source-config.c:1403
-#| msgid "Username:"
-msgid "User"
-msgstr "Käyttäjä"
-
-#. no suggestions. Put something in the menu anyway...
-#: ../widgets/misc/e-spell-entry.c:351
-#| msgid "(no subject)"
-msgid "(no suggestions)"
-msgstr "(ei ehdotuksia)"
-
-#: ../widgets/misc/e-spell-entry.c:375
-msgid "More..."
-msgstr "Lisää..."
+#~| msgid "Mail Headers Table"
+#~ msgid "_Basic Headers (fastest)"
+#~ msgstr "Sähköposti otsikkotaulu"
 
-#. + Add to Dictionary
-#: ../widgets/misc/e-spell-entry.c:444
-#, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "Lisää \"%s\" sanastoon"
-
-#. - Ignore All
-#: ../widgets/misc/e-spell-entry.c:487
 #, fuzzy
-#| msgid "Ignore"
-msgid "Ignore All"
-msgstr "Älä välitä"
-
-#: ../widgets/misc/e-spell-entry.c:513
-msgid "Spelling Suggestions"
-msgstr ""
-
-#: ../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:274 ../widgets/misc/e-web-view-gtkhtml.c:407
-msgid "_Copy Link Location"
-msgstr "_Kopioi linkin sijainti"
-
-#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
-msgid "Copy the link to the clipboard"
-msgstr "Kopioi linkki leikepöydälle"
-
-#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
-msgid "_Open Link in Browser"
-msgstr "_Avaa linkki selaimessa"
-
-#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
-msgid "Open the link in a web browser"
-msgstr "Avaa linkki selaimessa"
-
-#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
-msgid "_Copy Email Address"
-msgstr "_Kopioi sähköpostiosoite"
-
-#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
-msgid "_Copy Image"
-msgstr "K_opioi kuva"
-
-#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
-msgid "Copy the image to the clipboard"
-msgstr "Kopioi kuva leikepöydälle"
-
-#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1435
-#: ../widgets/misc/e-web-view-gtkhtml.c:466
-#: ../widgets/misc/e-web-view-gtkhtml.c:1311
-msgid "Select all text and images"
-msgstr "Valitse kaikki teksti ja kuvat"
-
-#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
-#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
-#: ../widgets/misc/e-web-view-gtkhtml.c:977
-#: ../widgets/misc/e-web-view-gtkhtml.c:979
-#, c-format
-msgid "Click to call %s"
-msgstr "Soita numeroon %s napsauttamalla"
-
-#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
-msgid "Click to hide/unhide addresses"
-msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
-
-#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
-#, c-format
-msgid "Click to open %s"
-msgstr "Napsauta avataksesi %s"
-
-#: ../widgets/misc/widgets.error.xml.h:1
-msgid "Do you wish to save your changes?"
-msgstr "Haluatko tallentaa muutokset?"
-
-#: ../widgets/misc/widgets.error.xml.h:2
-msgid "This signature has been changed, but has not been saved."
-msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
-
-#: ../widgets/misc/widgets.error.xml.h:3
-msgid "_Discard changes"
-msgstr "_Hylkää muutokset"
-
-#: ../widgets/misc/widgets.error.xml.h:4
-msgid "Blank Signature"
-msgstr "Tyhjä allekirjoitus"
-
-#: ../widgets/misc/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
-msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
-
-#: ../widgets/misc/widgets.error.xml.h:6
-#| msgid "Could not save signature file."
-msgid "Could not load signature."
-msgstr "Allekirjoitusta ei voi ladata."
-
-#: ../widgets/misc/widgets.error.xml.h:7
-#| msgid "Could not save signature file."
-msgid "Could not save signature."
-msgstr "Allekirjoitusta ei voi tallentaa."
-
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr "ponnahduslista"
-
-#: ../widgets/table/e-cell-date-edit.c:299
-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:317
-msgctxt "table-date"
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../widgets/table/e-cell-date-edit.c:325
-msgid "OK"
-msgstr "OK"
-
-#: ../widgets/table/e-cell-date-edit.c:873
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Ajan tulee olla muodossa: %s"
-
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
-
-#: ../widgets/table/e-table-click-to-add.c:609
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
-msgid "click to add"
-msgstr "lisää napsauttamalla"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr "(nouseva)"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr "(laskeva)"
-
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "Ei järjestetty"
-
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "Ei ryhmitystä"
+#~ msgid "Use this if you are not filtering any mailing lists."
+#~ msgstr ""
+#~ "_Perusotsakkeet (nopein)\n"
+#~ "Käytä tätä, jos sinulla ei ole otsakkeisiin perustuvia "
+#~ "postituslistasuotimia"
 
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "Show Fields"
-msgstr "Näytä kentät"
+#, fuzzy
+#~| msgid "Basic and _Mailing List Headers (Default)"
+#~ msgid "Basic and _Mailing List Headers (default)"
+#~ msgstr "Tavalliset ja _postituslistojen otsakkeet (oletus)"
 
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "Valittavat kentät"
+#~ msgid "Custom Headers"
+#~ msgstr "Omat otsakkeet"
 
-#: ../widgets/table/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "_Valittavat kentät:"
+#~ msgid "A_ccept"
+#~ msgstr "_Hyväksy"
 
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "_Näytä kentät järjestyksessä:"
+#~ msgid "Proxy _Logout"
+#~ msgstr "Kirjaudu _pois välimuistista"
 
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "Siirrä _ylös"
+#~| msgid "_Select..."
+#~ msgid "_Inspect..."
+#~ msgstr "_Tutki..."
 
-#: ../widgets/table/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "Siirrä _alas"
+#~ msgid "Unknown error."
+#~ msgstr "Tuntematon virhe."
 
-#: ../widgets/table/e-table-config.ui.h:7
-msgid "_Remove"
-msgstr "_Poista"
+#~ msgid "Mark All Read"
+#~ msgstr "Merkitse kaikki luetuksi"
 
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "_Show field in View"
-msgstr "_Näytä kenttä näkymässä"
+#~ msgid "Mark all messages in a folder as read."
+#~ msgstr "Merkitse kaikki kansion viestit luetuksi."
 
-#: ../widgets/table/e-table-config.ui.h:10
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Ascending"
-msgstr "Nouseva"
+#~ msgid "Could not open %s: Unknown error"
+#~ msgstr "Ei voitu avata kohdetta %s: tuntematon virhe"
 
-#: ../widgets/table/e-table-config.ui.h:11
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Descending"
-msgstr "Laskeva"
-
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Group Items By"
-msgstr "Ryhmittele kentän mukaan"
-
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show _field in View"
-msgstr "Näytä _kenttä näkymässä"
+#~ msgid "Could not publish calendar: Calendar backend no longer exists"
+#~ msgstr ""
+#~ "Kalenteria ei voitu julkaista: kalenterin taustaohjelmaa ei enää ole "
+#~ "olemassa"
 
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Then By"
-msgstr "sitten"
+#~ msgid "Define Views..."
+#~ msgstr "Määrittele näkymät..."
 
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Show field i_n View"
-msgstr "Näytä k_enttä näkymässä"
+#~ msgid "Create or edit views"
+#~ msgstr "Luo tai muokkaa näkymiä"
 
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Show field in _View"
-msgstr "Näytä kenttä _näkymässä"
+#~ msgid "Start in \"express\" mode"
+#~ msgstr "Käynnistä ”pikatilassa”"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "Tyhjennä k_aikki"
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "Tiedosto ei ole kelvollinen .desktop-tiedosto"
 
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Järjestä"
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "Tuntematon työpöytätiedoston versio \"%s\""
 
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "Järjestä kentän mukaan"
+#~ msgid "Starting %s"
+#~ msgstr "Käynnistetään %s"
 
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "Clear All"
-msgstr "Tyhjennä merkki"
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "Ohjelma ei hyväksy asiakirjoja komentorivillä"
 
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "_Järjestä..."
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "Tuntematon käynnistinvalitsin: %d"
 
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "_Ryhmittele..."
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr "Asiakirja-URIa ei voi välittää \"Type-Link\"-työpöytälinkille"
 
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "_Näytettävät kentät..."
+#~ msgid "Not a launchable item"
+#~ msgstr "Kohde ei ole käynnistettävä"
 
-#: ../widgets/table/e-table-field-chooser.c:152
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
-"johon haluat sen ilmestyvän."
+#~ msgid "Disable connection to session manager"
+#~ msgstr "Estä yhteys istunnonhallintaan"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:224
-msgid "Add a Column"
-msgstr "Lisää sarake"
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "Anna tallennetut asetukset sisältävä tiedosto"
 
-#. 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:360
-#, 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:372
-#, 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-header-item.c:1574
-msgid "Customize Current View"
-msgstr "Muokkaa nykyistä näkymää"
-
-#: ../widgets/table/e-table-header-item.c:1596
-msgid "Sort _Ascending"
-msgstr "järjestä _nousevasti"
+#~ msgid "FILE"
+#~ msgstr "TIEDOSTO"
 
-#: ../widgets/table/e-table-header-item.c:1599
-msgid "Sort _Descending"
-msgstr "Järjestä _laskevasti"
+#~ msgid "Specify session management ID"
+#~ msgstr "Anna istunnonhallinnan tunniste"
 
-#: ../widgets/table/e-table-header-item.c:1602
-msgid "_Unsort"
-msgstr "Poista _järjestys"
+#~ msgid "ID"
+#~ msgstr "TUNNISTE"
 
-#: ../widgets/table/e-table-header-item.c:1605
-msgid "Group By This _Field"
-msgstr "Ryhmittele tämän _kentän mukaan"
+#~ msgid "Session management options:"
+#~ msgstr "Istunnonhallinnan valitsimet:"
 
-#: ../widgets/table/e-table-header-item.c:1608
-msgid "Group By _Box"
-msgstr "Ryhmittele _laatikoittain"
+#~ msgid "Show session management options"
+#~ msgstr "Näytä istunnonhallinnan valinnat"
 
-#: ../widgets/table/e-table-header-item.c:1612
-msgid "Remove This _Column"
-msgstr "Poista tämä sa_rake"
+#~ msgid "Certificate Viewer: %s"
+#~ msgstr "Varmenteen katselin: %s"
 
-#: ../widgets/table/e-table-header-item.c:1615
-msgid "Add a C_olumn..."
-msgstr "Lisää _sarake..."
+#~ msgid "Define Views for %s"
+#~ msgstr "Määrittele näkymät - %s"
 
-#: ../widgets/table/e-table-header-item.c:1619
-msgid "A_lignment"
-msgstr "_Tasaus"
+#~ msgid "Define Views"
+#~ msgstr "Määrittele näkymät"
 
-#: ../widgets/table/e-table-header-item.c:1622
-msgid "B_est Fit"
-msgstr "_Paras sovitus"
+#~ msgid "Define Views for \"%s\""
+#~ msgstr "Määrittele %s näkymät"
 
-#: ../widgets/table/e-table-header-item.c:1625
-msgid "Format Column_s..."
-msgstr "Muotoile _sarakkeet..."
+#~ msgid "Table"
+#~ msgstr "Taulu"
 
-#: ../widgets/table/e-table-header-item.c:1629
-msgid "Custo_mize Current View..."
-msgstr "_Mukauta nykyistä näkymää..."
+#~ msgid "Define New View"
+#~ msgstr "Määrittele uusi näkymä"
 
-#: ../widgets/table/e-table-header-item.c:1691
-msgid "_Sort By"
-msgstr "_Järjestystapa"
+#~ msgid "Name of new view:"
+#~ msgstr "Uuden näkymän nimi:"
 
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1709
-msgid "_Custom"
-msgstr "_Oma"
+#~ msgid "Type of view:"
+#~ msgstr "Näkymän tyyppi:"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Taulukon solu"
+#~ msgid "Type of View"
+#~ msgstr "Näkymän tyyppi"
 
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "Ponnauta lapsi"
+#~ 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ää"
 
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr "Vaihtele solun näkyvyyttä"
+#~ msgid "_Send To..."
+#~ msgstr "_Lähetä..."
 
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
+#~ msgid "Send the selected attachments somewhere"
+#~ msgstr "Lähetä valitut liitteet jonnekin"
 
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr "piilota tämän solun sisältävä ETreen rivi"
+#~ msgid "Available Fields"
+#~ msgstr "Valittavat kentät"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "napsauta"
+#~ msgid "A_vailable Fields:"
+#~ msgstr "_Valittavat kentät:"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:161
-msgid "sort"
-msgstr "järjestä"
+#~ msgid "_Show these fields in order:"
+#~ msgstr "_Näytä kentät järjestyksessä:"
 
-#: ../widgets/text/e-text.c:2074
-msgid "Select All"
-msgstr "Valitse kaikki"
+#~ msgid "Move _Up"
+#~ msgstr "Siirrä _ylös"
 
-#: ../widgets/text/e-text.c:2087
-msgid "Input Methods"
-msgstr "Syötemenetelmät"
+#~ msgid "Move _Down"
+#~ msgstr "Siirrä _alas"
 
 #~ msgid "Some features may not work properly with your current server"
 #~ msgstr ""
@@ -21933,9 +22267,6 @@ msgstr "Syötemenetelmät"
 #~ msgid "Enter Passphrase for %s"
 #~ msgstr "Anna salasana tunnukselle %s"
 
-#~ msgid "Enter Passphrase"
-#~ msgstr "Anna salasana"
-
 #~ msgid "Enter Password"
 #~ msgstr "Anna salasana"
 
@@ -22041,9 +22372,6 @@ msgstr "Syötemenetelmät"
 #~ msgid "Attachment"
 #~ msgstr "Liite"
 
-#~ msgid "No HTML stream available"
-#~ msgstr "HTML-virtaa ei ole saatavilla"
-
 #~ msgid "Composer Window default width"
 #~ msgstr "Viesti-ikkunan oletusleveys"
 
@@ -22135,9 +22463,6 @@ msgstr "Syötemenetelmät"
 #~ "\"Lähetä ja vastaanota sähköpostia\"-ikkunan aloitusleveys. Arvo muuttuu, "
 #~ "jos käyttäjä muuttaa ikkunan leveyttä."
 
-#~ msgid "Default reply style"
-#~ msgstr "Vastauksen oletustyyli"
-
 #~ msgid "List of accounts"
 #~ msgstr "Luettelo tileistä"
 
@@ -22296,9 +22621,6 @@ msgstr "Syötemenetelmät"
 #~ msgid "The script file must exist and be executable."
 #~ msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#~ msgid "Unable to connect to the GroupWise server."
-#~ msgstr "GroupWise-palvelimeen ei saatu yhteyttä."
-
 #~ msgid "Please check your account settings and try again."
 #~ msgstr "Tarkista tilisi asetukset ja yritä uudestaan."
 


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