[evolution] Updated Finnish translation



commit 508747d7beb4adacb15a04a5269a663ead605672
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Mon Mar 14 18:33:23 2016 +0000

    Updated Finnish translation

 po/fi.po | 8465 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 4693 insertions(+), 3772 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 833822a..1e494bb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@
 #
 # Ville-Pekka Vainio <vpivaini cs helsinki fi>, 2010.
 # Lasse Liehu <lasse liehu gmail com>, 2014.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2014, 2015.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2014, 2015, 2016.
 #
 #: ../shell/main.c:522
 msgid ""
@@ -21,8 +21,8 @@ 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: 2015-09-15 16:36+0000\n"
-"PO-Revision-Date: 2015-09-15 21:40+0300\n"
+"POT-Creation-Date: 2016-03-14 05:52+0000\n"
+"PO-Revision-Date: 2016-03-14 20:32+0200\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"
@@ -32,7 +32,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: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -99,7 +99,7 @@ msgid "This address book will be removed permanently."
 msgstr "Tämä osoitekirja poistetaan pysyvästi."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "_Älä poista"
 
@@ -116,7 +116,7 @@ msgstr ""
 "jatkaa?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "_Poista palvelimelta"
 
@@ -133,7 +133,6 @@ msgid "Unable to perform search."
 msgstr "Hakua ei voi suorittaa."
 
 #: ../addressbook/addressbook.error.xml.h:20
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to refresh address book '{0}'"
 msgstr "Osoitekirjan '{0}' päivittäminen epäonnistui"
 
@@ -205,16 +204,13 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-comp-editor-page-general.c:1357
 #: ../e-util/e-mail-signature-manager.c:327
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:57 ../modules/mail/em-composer-prefs.c:417
-#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
@@ -254,7 +250,7 @@ msgstr ""
 "lisätä sen silti?"
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -314,9 +310,6 @@ msgid "_Where:"
 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:27
 msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
 
@@ -340,7 +333,6 @@ msgid "Telephone"
 msgstr "Puhelin"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-#| msgid "Address"
 msgid "SIP Address"
 msgstr "SIP-osoite"
 
@@ -349,7 +341,7 @@ msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Yhteystieto"
 
@@ -358,8 +350,7 @@ msgid "_Home Page:"
 msgstr "K_otisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/e-comp-editor-event.c:631
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
@@ -377,7 +368,7 @@ msgid "Home Page:"
 msgstr "Kotisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:92
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
@@ -450,18 +441,19 @@ msgstr "_Vuosipäivä:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2049
+#: ../calendar/gui/e-calendar-view.c:2037
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2048
+#: ../calendar/gui/e-calendar-view.c:2036
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
@@ -513,7 +505,7 @@ msgstr "Työ"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3791
+#: ../calendar/gui/e-cal-model.c:3825
 msgid "Other"
 msgstr "Muut"
 
@@ -522,6 +514,8 @@ msgid "Mailing Address"
 msgstr "Postitusosoite"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Muistilaput"
 
@@ -535,15 +529,14 @@ msgstr "Lisää _X.509"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:475
-#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
-#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:58
-#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../calendar/gui/e-comp-editor-page-general.c:1373
+#: ../e-util/e-attachment-view.c:475 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
+#: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
+#: ../mail/mail-config.ui.h:59
+#: ../plugins/attachment-reminder/attachment-reminder.c:467
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
@@ -563,11 +556,10 @@ msgstr "_Lataa X.509"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
 #: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3230
+#: ../e-util/e-attachment-store.c:641
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
 #: ../smime/gui/certificate-manager.c:655
@@ -581,16 +573,16 @@ msgid "Certificates"
 msgstr "Varmenteet"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
+#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1215 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Asetukset"
 
@@ -607,15 +599,12 @@ msgstr "Asetukset"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:474
 #: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1332
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2326
-#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:421
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1365
+#: ../calendar/gui/e-cal-dialogs.c:689
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
+#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
@@ -623,15 +612,15 @@ msgstr "Asetukset"
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3229
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:18
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
 #: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
@@ -651,22 +640,18 @@ msgid "_Cancel"
 msgstr "_Peru"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-#| msgid "Telephone"
 msgid "Show Telephone"
 msgstr "Näytä puhelin"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-#| msgid "_To This Address"
 msgid "Show SIP Address"
 msgstr "Näytä SIP-osoite"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-#| msgid "Instant Messaging"
 msgid "Show Instant Messaging"
 msgstr "Näytä pikaviestin"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-#| msgid "Web Addresses"
 msgid "Show Web Addresses"
 msgstr "Näytä verkko-osoitteet"
 
@@ -707,31 +692,26 @@ msgid "Show Notes"
 msgstr "Näytä %s"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
-#| msgid "Certificates"
 msgid "Show Certificates"
 msgstr "Näytä varmenteet"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../e-util/e-html-editor-actions.c:1111
-#| msgid "Undo"
+#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
 msgid "_Undo"
 msgstr "_Kumoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Kumoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/dialogs/comp-editor.c:1333
-#: ../e-util/e-html-editor-actions.c:1097
-#| msgid "Redo"
+#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Tee uudelleen"
 
@@ -755,7 +735,6 @@ msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
-#| msgid "Certificates"
 msgid "X.509 certificates"
 msgstr "X.509-varmenteet"
 
@@ -770,18 +749,16 @@ msgid "All files"
 msgstr "Kaikki tiedostot"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
-#| msgid "OpenPGP _Key ID:"
 msgid "Open PGP key"
 msgstr "Avaa PGP-avain"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
-#| msgid "Select certificate"
 msgid "Open X.509 certificate"
 msgstr "Avaa X.509-varmenne"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
 #: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
 #: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
@@ -790,13 +767,11 @@ msgstr "_Avaa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
-#| msgid "Choose an iCalendar file"
 msgid "Chosen file is not a local file."
 msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
 #, c-format
-#| msgid "Failed to import certificate"
 msgid "Failed to load certificate: %s"
 msgstr "Varmenteen lataaminen epäonnistui: %s"
 
@@ -815,13 +790,11 @@ msgid "Save PGP key"
 msgstr "Tallenna PGP-avain"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
-#| msgid "Select certificate"
 msgid "Save X.509 certificate"
 msgstr "Tallenna X.509-varmenne"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
 #, c-format
-#| msgid "Failed to import certificate"
 msgid "Failed to save certificate: %s"
 msgstr "Varmenteen tallentaminen epäonnistui: %s"
 
@@ -870,16 +843,13 @@ msgstr "Virheellinen yhteystieto."
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2327
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
 #: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
 #: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
 #: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
@@ -890,7 +860,7 @@ msgstr "Virheellinen yhteystieto."
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:184 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_OK"
@@ -1028,12 +998,12 @@ msgid "_Top"
 msgstr "Ylimm_äiseksi"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
 msgid "_Up"
 msgstr "_Ylös"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
 msgid "_Down"
 msgstr "_Alas"
 
@@ -1063,22 +1033,22 @@ msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 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:1181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:985
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -1093,22 +1063,22 @@ msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:340
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:350
+#: ../e-util/e-web-view.c:352
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:352
+#: ../e-util/e-web-view.c:354
 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:290
-#: ../e-util/e-web-view.c:1064
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -1203,16 +1173,14 @@ msgid "Video Chat"
 msgstr "Videokeskustelu"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:572
+#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../modules/calendar/e-cal-shell-view.c:579
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalenteri"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
@@ -1468,61 +1436,61 @@ msgstr "Haku keskeytettiin"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
 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:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
 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:1308
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
 #, 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:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
 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:1322
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../e-util/e-focus-tracker.c:785
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
+#: ../calendar/gui/e-comp-editor.c:1993 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805
 #: ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
 #: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
@@ -1530,7 +1498,7 @@ msgid "_Delete"
 msgstr "_Poista"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1545,11 +1513,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:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
 msgid "_Don't Display"
 msgstr "Ä_lä näytä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -1660,7 +1628,7 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-meeting-list-view.c:659
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
@@ -1674,10 +1642,9 @@ msgid "Journal"
 msgstr "Päiväkirja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../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 ../e-util/e-categories-dialog.c:87
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Ryhmät"
 
@@ -1723,13 +1690,13 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2385
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2090
+#: ../e-util/e-html-editor-actions.c:2106
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1796,55 +1763,56 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:430
-#: ../calendar/importers/icalendar-importer.c:925
-#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:485
+#: ../calendar/importers/icalendar-importer.c:980
+#: ../calendar/importers/icalendar-importer.c:1019
+#: ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1089
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:814
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:815
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../addressbook/importers/evolution-vcard-importer.c:642
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../addressbook/importers/evolution-vcard-importer.c:643
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
@@ -1942,61 +1910,51 @@ msgid "Other SIP"
 msgstr "Muut"
 
 #: ../addressbook/util/eab-book-util.c:74
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/util/eab-book-util.c:75
-#| msgid "Jabber"
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/util/eab-book-util.c:76
-#| msgid "Yahoo"
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/util/eab-book-util.c:77
-#| msgid "Gadu-Gadu"
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/util/eab-book-util.c:78
-#| msgid "MSN"
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/util/eab-book-util.c:79
-#| msgid "ICQ"
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/util/eab-book-util.c:80
-#| msgid "GroupWise"
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/util/eab-book-util.c:81
-#| msgid "Skype"
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/util/eab-book-util.c:82
-#| msgid "Twitter"
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Twitter"
 
 #: ../addressbook/util/eab-book-util.c:83
-#| msgid "Google Features"
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -2006,7 +1964,6 @@ msgstr "Google Talk"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:126
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "Sähköposti"
@@ -2027,7 +1984,6 @@ msgstr "SIP"
 #. * IM=Instant Messaging
 #.
 #: ../addressbook/util/eab-book-util.c:216
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "Pikaviestin"
@@ -2037,7 +1993,6 @@ msgstr "Pikaviestin"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:271
-#| msgid "Phone"
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Puhelin"
@@ -2054,11 +2009,7 @@ msgid_plural "hours"
 msgstr[0] "tunti"
 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:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
@@ -2069,7 +2020,7 @@ msgid "Start time"
 msgstr "Alkamisaika"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1924
+#: ../calendar/alarm-notify/alarm-queue.c:1949
 msgid "Appointments"
 msgstr "Tapaamiset"
 
@@ -2082,16 +2033,13 @@ msgid "_Snooze"
 msgstr "_Torku"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-html-editor-actions.c:1120
+#: ../calendar/gui/e-comp-editor-page-general.c:1365
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
+#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
 #: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
-#: ../plugins/attachment-reminder/attachment-reminder.c:443
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
+#: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
@@ -2108,8 +2056,8 @@ msgid "_Dismiss"
 msgstr "_Hylkää"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-#: ../calendar/alarm-notify/alarm-queue.c:1898
+#: ../calendar/alarm-notify/alarm-queue.c:1916
+#: ../calendar/alarm-notify/alarm-queue.c:1926
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2127,30 +2075,25 @@ 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:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
 #: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:326
+#: ../modules/calendar/e-cal-shell-view-actions.c:344
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "päivä"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "tuntia"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19
 #: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minuutti"
 
 #: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1896
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla."
 
@@ -2164,8 +2107,8 @@ msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla."
 
 #: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1859
-#: ../calendar/alarm-notify/alarm-queue.c:2214
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../calendar/alarm-notify/alarm-queue.c:2240
 msgid "Evolution Reminders"
 msgstr "Evolution-muistuttajat"
 
@@ -2176,21 +2119,21 @@ msgid_plural "You have %d reminders"
 msgstr[0] "Sinulla on %d muistutus"
 msgstr[1] "Sinulla on %d muistutusta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2032
+#: ../calendar/alarm-notify/alarm-queue.c:2058
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2033 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Ei"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2034
+#: ../calendar/alarm-notify/alarm-queue.c:2060
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2038
+#: ../calendar/alarm-notify/alarm-queue.c:2064
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2207,7 +2150,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2053
+#: ../calendar/alarm-notify/alarm-queue.c:2079
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 
@@ -2215,7 +2158,7 @@ msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 msgid "invalid time"
 msgstr "epäkelpo aika"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d hours before start"
 #: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
@@ -2224,7 +2167,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d minutes before start"
 #: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
@@ -2234,7 +2177,7 @@ msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
@@ -2264,8 +2207,7 @@ msgstr "Älä läh_etä"
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
@@ -2283,8 +2225,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "tehtävä on peruttu."
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Haluatko varmasti poistaa tämän tehtävän?"
@@ -2305,8 +2246,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "muistilappu on poistettu."
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
@@ -2384,7 +2324,7 @@ msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
 #: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
@@ -2423,7 +2363,7 @@ msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat kuitata osanottonsa."
 
 #: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:36 ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Lähetä"
@@ -2488,38 +2428,73 @@ msgstr ""
 "tehtävälistansa ajan tasalla."
 
 #: ../calendar/calendar.error.xml.h:52
+#, fuzzy
+#| msgid "Would you like to send this task to participants?"
+msgid "Would you like to send this memo to participants?"
+msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
+
+#: ../calendar/calendar.error.xml.h:53
+#, fuzzy
+#| msgid ""
+#| "Email invitations will be sent to all participants and allow them to "
+#| "accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr ""
+"Kutsu lähetetään kaikille osanottajille ja he voivat hyväksyä tämän tehtävän."
+
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+#| msgid "Would you like to send updated meeting information to participants?"
+msgid "Would you like to send updated memo information to participants?"
+msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
+
+#: ../calendar/calendar.error.xml.h:55
+#, fuzzy
+#| msgid ""
+#| "Sending updated information allows other participants to keep their task "
+#| "lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
+"tehtävälistansa ajan tasalla."
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Muokkainta ei voi avata."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "Poistetaanko kalenteri \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Tämä kalenteri poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
 msgstr "Poistetaanko tehtävälista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Tämä tehtävälista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Tämä muistilappulista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "Poistetaanko etäkalenteri \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2527,11 +2502,11 @@ msgstr ""
 "Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti "
 "jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
 msgstr "Poistetaanko etätehtävälista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2539,11 +2514,11 @@ msgstr ""
 "Etätehtävälista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
 "jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
 msgstr "Poistetaanko etämuistiolista \"{0}\"?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2551,11 +2526,11 @@ msgstr ""
 "Etämuistiolista \"{0}\" poistetaan palvelimelta pysyvästi. Haluatko varmasti "
 "jatkaa?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 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:67
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2563,11 +2538,11 @@ msgstr ""
 "Merkityksellisen yhteenvedon lisääminen helpottaa ymmärtämään, mistä "
 "tapaamisessa on kyse."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 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:69
+#: ../calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2575,25 +2550,25 @@ msgstr ""
 "Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa ymmärtämään, "
 "mistä tehtävässä on kyse."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "Virhe ladatessa kalenteria \"{0}\""
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 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:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Tapahtumaa ei voi tallentaa"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2601,297 +2576,330 @@ msgstr ""
 "\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
 "toinen kalenteri, johon tapaamisia voidaan lisätä."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Tehtävää ei voi tallentaa"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 #, fuzzy
 #| msgid "Error loading task list"
 msgid "Error loading task list '{0}'"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 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."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 #, fuzzy
 #| msgid "Error loading memo list"
 msgid "Error loading memo list '{0}'"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:89
 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 the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+#, fuzzy
+msgid "Failed to add timezone to '{0}'"
+msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+#| msgid "Could not save attachments"
+msgid "Failed to save attachments"
+msgstr "Liitteitä ei voitu tallentaa"
+
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:95
 #, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to open calendar '{0}'"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:97
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to open memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:99
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to open task list '{0}'"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:101
 #, fuzzy
 #| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to create an event in the calendar '{0}'"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:103
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to create a memo in the memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:105
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to create a task in the task list '{0}'"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:107
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to modify an event in the calendar '{0}'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:109
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to modify a memo in the memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:111
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to modify a task in the task list '{0}'"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:113
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to delete an event in the calendar '{0}'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:115
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to delete a memo in the memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:117
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to delete a task in the task list '{0}'"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
+#: ../calendar/calendar.error.xml.h:119
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to update an event in the calendar '{0}'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:113
+#: ../calendar/calendar.error.xml.h:121
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to update a memo in the memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:115
+#: ../calendar/calendar.error.xml.h:123
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to update a task in the task list '{0}'"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:117
+#: ../calendar/calendar.error.xml.h:125
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to send an event to the calendar '{0}'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:119
+#: ../calendar/calendar.error.xml.h:127
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to send a memo to the memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:121
+#: ../calendar/calendar.error.xml.h:129
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to send a task to the task list '{0}'"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:131
 #, fuzzy
 #| msgid "Error loading calendar '{0}'"
 msgid "Error creating view for the calendar '{0}'"
 msgstr "Virhe ladatessa kalenteria \"{0}\""
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:125
+#: ../calendar/calendar.error.xml.h:133
 #, fuzzy
 #| msgid "Error loading task list"
 msgid "Error creating view for the task list '{0}'"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:135
 #, fuzzy
 #| msgid "Error loading memo list"
 msgid "Error creating view for the memo list '{0}'"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:137
 #, 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:131
+#: ../calendar/calendar.error.xml.h:139
 #, 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:133
+#: ../calendar/calendar.error.xml.h:141
 #, 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:135
+#: ../calendar/calendar.error.xml.h:143
 #, 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:137
+#: ../calendar/calendar.error.xml.h:145
 #, 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"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:139
+#: ../calendar/calendar.error.xml.h:147
 #, 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"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:149
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to get an event from the calendar '{0}'"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:151
+#, fuzzy
+#| msgid "Unable to find this task in any task list"
+msgid "Failed to get a task from 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:153
+#, fuzzy
+#| msgid "Unable to find this memo in any memo list"
+msgid "Failed to get a memo from 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:155
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:143
+#: ../calendar/calendar.error.xml.h:157
 #, 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"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:145
+#: ../calendar/calendar.error.xml.h:159
 #, fuzzy
 #| msgid "Delete memo list '{0}'?"
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:147
+#: ../calendar/calendar.error.xml.h:161
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:149
+#: ../calendar/calendar.error.xml.h:163
 #, 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:151
+#: ../calendar/calendar.error.xml.h:165
 #, fuzzy
 #| msgid "Delete memo list '{0}'?"
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:153
+#: ../calendar/calendar.error.xml.h:167
 #, fuzzy
 #| msgid "Delete remote calendar '{0}'?"
 msgid "Failed to refresh calendar '{0}'"
 msgstr "Poistetaanko etäkalenteri \"{0}\"?"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:155
+#: ../calendar/calendar.error.xml.h:169
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Failed to refresh 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:157
+#: ../calendar/calendar.error.xml.h:171
 #, fuzzy
 #| msgid "Unable to find this memo in any memo list"
 msgid "Failed to refresh memo list '{0}'"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../calendar/calendar.error.xml.h:158
+#: ../calendar/calendar.error.xml.h:172
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Failed to make an occurrence movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../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/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Kuvaus"
@@ -2910,7 +2918,7 @@ 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
-#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Kuvaus"
@@ -2936,25 +2944,21 @@ msgstr "on"
 msgid "is not"
 msgstr "ei ole"
 
-#. 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:246 ../calendar/gui/e-cal-model.c:306
-#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Julkinen"
 
-#. 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:247 ../calendar/gui/e-cal-model.c:315
-#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#. 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:248 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
@@ -2984,29 +2988,27 @@ 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
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
 #: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Liitteet"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
-#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "On olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -3036,1295 +3038,23 @@ msgstr "Yhteenveto sisältää"
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "Muokkaa muistutusta"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:424
-msgid "Pop up an alert"
-msgstr "Ponnahdusikkuna hälytykselle"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:420
-msgid "Play a sound"
-msgstr "Soita ääni"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:432
-msgid "Run a program"
-msgstr "Suorita ohjelma"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:428
-msgid "Send an email"
-msgstr "Lähetä sähköpostia"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "ennen"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "jälkeen"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "tapaamisen alkua"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "tapaamisen päättymistä"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "minuutti(a)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "tunti(a)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "päivä(ä)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "Lisää muistutus"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "Muistutus"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "Toista"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-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:14
-msgid "extra times every"
-msgstr "ylimääräistä kertaa joka"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "Oma _viesti"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "_Viesti:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "Oma _hälytysääni muistutukselle"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "_Ääni:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "Valitse tiedosto"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "_Ohjelma:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "_Argumentit:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "Lähetä:"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "Toimenpide/liipaisin"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "Reminders"
-msgstr "Muistutukset"
-
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "Tapahtuma on poistettu."
-
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "Tehtävä on poistettu."
-
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "Muistilappu on poistettu."
-
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, 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
-#, 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
-msgid "This event has been changed."
-msgstr "Tapahtumaa on muutettu."
-
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "Tehtävää on muutettu."
-
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "Muistilappua on muutettu."
-
-#: ../calendar/gui/dialogs/changed-comp.c:102
-#, 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:104
-#, 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:299
-msgid "Could not save attachments"
-msgstr "Liitteitä ei voitu tallentaa"
-
-#: ../calendar/gui/dialogs/comp-editor.c:653
-msgid "Could not update object"
-msgstr "Kohdetta ei voi päivittää"
-
-#: ../calendar/gui/dialogs/comp-editor.c:787
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
-
-#: ../calendar/gui/dialogs/comp-editor.c:794
-#, c-format
-msgid "Meeting - %s"
-msgstr "Kokous - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:796
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:802
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tehtävänanto - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:804
-#, c-format
-msgid "Task - %s"
-msgstr "Tehtävä - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:809
-#, c-format
-msgid "Memo - %s"
-msgstr "Muistilappu - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:825
-msgid "No Summary"
-msgstr "Ei yhteenvetoa"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-msgid "Keep original item?"
-msgstr "Säilytetäänkö alkuperäinen?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Unable to synchronize with the server"
-msgstr "Synkronointi palvelimen kanssa ei onnistu"
-
-#. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
-#: ../e-util/e-mail-signature-editor.c:295
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
-#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2066
-msgid "_Close"
-msgstr "_Sulje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1251
-msgid "Close the current window"
-msgstr "Sulje nykyinen ikkuna"
-
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
-#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
-msgid "_Copy"
-msgstr "_Kopioi"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:175
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:379
-#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:801
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
-
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
-msgid "Cu_t"
-msgstr "_Leikkaa"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1265 ../e-util/e-focus-tracker.c:168
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1409
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../e-util/e-focus-tracker.c:189
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:815
-msgid "Delete the selection"
-msgstr "Poista valinta"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1279
-msgid "View help"
-msgstr "Näytä ohje"
-
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
-msgid "_Paste"
-msgstr "_Liitä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1286 ../e-util/e-focus-tracker.c:182
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1421
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
-msgid "Paste the clipboard"
-msgstr "Liitä leikepöytä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1291
-#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/addressbook/e-book-shell-view-actions.c:1219
-msgid "_Print..."
-msgstr "T_ulosta..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
-#: ../modules/addressbook/e-book-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-actions.c:1642
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:964
-msgid "Pre_view..."
-msgstr "E_sikatselu..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1307
-msgid "Save current changes"
-msgstr "Tallenna nykyiset muutokset"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1312
-#: ../e-util/e-mail-signature-editor.c:304
-msgid "Save and Close"
-msgstr "Tallenna ja sulje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "Save current changes and close editor"
-msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:387
-#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
-msgid "Select _All"
-msgstr "Valitse _kaikki"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1321 ../e-util/e-focus-tracker.c:196
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:913
-msgid "Select all text"
-msgstr "Valitse kaikki teksti"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-msgid "_Classification"
-msgstr "Lu_okittelu"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:948
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1370
-#: ../e-util/e-html-editor-actions.c:1148
-msgid "_Insert"
-msgstr "L_isää"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:378
-msgid "_Options"
-msgstr "_Asetukset"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1384
-#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "_Näytä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1394
-#: ../composer/e-composer-actions.c:327
-msgid "_Attachment..."
-msgstr "_Liite..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
-msgid "Attach a file"
-msgstr "Liitä tiedosto viestiin"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1404
-msgid "_Categories"
-msgstr "_Luokat"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1406
-msgid "Toggles whether to display categories"
-msgstr "Määrittää näytetäänkö luokat"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Time _Zone"
-msgstr "_Aikavyöhyke"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1414
-msgid "Toggles whether the time zone is displayed"
-msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1423
-msgid "Pu_blic"
-msgstr "J_ulkinen"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1425
-msgid "Classify as public"
-msgstr "Luokittele julkiseksi"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "_Private"
-msgstr "_Yksityinen"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1432
-msgid "Classify as private"
-msgstr "Luokittele yksityiseksi"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1437
-msgid "_Confidential"
-msgstr "_Luottamuksellinen"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1439
-msgid "Classify as confidential"
-msgstr "Luokittele luottamukselliseksi"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1447
-msgid "R_ole Field"
-msgstr "R_oolikenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1449
-msgid "Toggles whether the Role field is displayed"
-msgstr "Määrittää näytetäänkö roolikenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1455
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1457
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Määrittää näytetäänkö RSVP-kenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1463
-msgid "_Status Field"
-msgstr "_Tilakenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1465
-msgid "Toggles whether the Status field is displayed"
-msgstr "Määrittää näytetäänkö tilakenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1471
-msgid "_Type Field"
-msgstr "T_yyppikenttä"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1473
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2596
-#: ../composer/e-composer-actions.c:612
-msgid "Attach"
-msgstr "Liitä tiedosto"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2926
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../calendar/gui/dialogs/comp-editor.c:4525
-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:4487
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
-msgid "attachment"
-msgstr "liite"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4557
-msgid "Unable to use current version!"
-msgstr "Nykyistä versiota ei voi käyttää!"
-
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "Tarkistusvirhe: %s"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1968
-msgid "Destination is read only"
-msgstr "Kohde on vain luettavissa"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:209
-#, c-format
-#| msgid "Copying an event into the calendar %s"
-msgid "Copying events to the calendar '%s'"
-msgstr "Kopioidaan tapahtumia kalenteriin '%s'"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:215
-#, fuzzy, c-format
-#| msgid "Delete memo list '{0}'?"
-msgid "Copying memos to the memo list '%s'"
-msgstr "Poistetaanko muistilappulista \"{0}\"?"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:221
-#, c-format
-#| msgid "Show task preview below the task list"
-msgid "Copying tasks to the task list '%s'"
-msgstr "Kopioidaan tehtäviä tehtävälistaan '%s'"
-
-#: ../calendar/gui/dialogs/delete-comp.c:215
-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:218
-msgid "_Retract comment"
-msgstr "_Poista kommentti"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "Syötä valtuutettu"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "Valtuuta:"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "Yhteystiedot..."
-
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "_Muistutukset"
-
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
-
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "Näytä aika _varattuna"
-
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "Määrittää näytetäänkö aika varattuna"
-
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "T_oistuvuus"
-
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "Muuta tämä tapahtuma toistuvaksi"
-
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "Lähetysasetukset"
-
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "Lisää erityisiä lähetysvaihtoehtoja"
-
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "Koko _päivän tapahtuma"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
-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:253
-msgid "_Free/Busy"
-msgstr "_Vapaa/Varattu"
-
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
-
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
-msgid "Appointment"
-msgstr "Tapaaminen"
-
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "Osanottajat"
-
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "Tulosta tämä tapahtuma"
-
-#: ../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: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: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:650
-#: ../calendar/gui/dialogs/event-page.c:3198
-msgid "This event has reminders"
-msgstr "Tapahtumaan liittyy muistutuksia"
-
-#: ../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:1309
-msgid "Event with no start date"
-msgstr "Tapahtuma ilman alkupäivämäärää"
-
-#: ../calendar/gui/dialogs/event-page.c:1312
-msgid "Event with no end date"
-msgstr "Tapahtuma ilman päättymispäivää"
-
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1032
-msgid "Start date is wrong"
-msgstr "Aloituspäiväys on virheellinen"
-
-#: ../calendar/gui/dialogs/event-page.c:1501
-msgid "End date is wrong"
-msgstr "Lopetuspäiväys on virheellinen"
-
-#: ../calendar/gui/dialogs/event-page.c:1543
-msgid "Start time is wrong"
-msgstr "Alkamisaika on väärin"
-
-#: ../calendar/gui/dialogs/event-page.c:1551
-msgid "End time is wrong"
-msgstr "Lopetusaika on virheellinen"
-
-#: ../calendar/gui/dialogs/event-page.c:1715
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1086
-msgid "An organizer is required."
-msgstr "Järjestäjä vaaditaan."
-
-#: ../calendar/gui/dialogs/event-page.c:1750
-#: ../calendar/gui/dialogs/task-page.c:1121
-msgid "At least one attendee is required."
-msgstr "Vähintään yksi läsnäolija vaaditaan."
-
-#: ../calendar/gui/dialogs/event-page.c:1956
-msgid "_Delegatees"
-msgstr "_Valtuutetut"
-
-#: ../calendar/gui/dialogs/event-page.c:1958
-msgid "Atte_ndees"
-msgstr "_Osanottajat"
-
-#: ../calendar/gui/dialogs/event-page.c:3478
-#, 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:3484
-#, 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:3490
-#, 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:3511
-#| msgid "_Custom"
-msgid "Custom"
-msgstr "Omavalintainen"
-
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3518
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "Ei mitään"
-
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "kesto"
-
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "saakka"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minuuttia ennen tapaamista"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "Yksi tunti ennen tapaamista"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "Yksi päivä ennen tapaamista"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-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:29
-#: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
-#: ../e-util/e-html-editor-link-dialog.c:422
-msgid "_Description:"
-msgstr "K_uvaus:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "_Aika:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "Aika_vyöhyke:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "_Yhteenveto:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "Tapahtuman kuvaus"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:555
-msgid "Atte_ndees..."
-msgstr "_Osanottajat..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "_Muistutus"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "Tammikuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "Helmikuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "Maaliskuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "Huhtikuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "Toukokuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "Kesäkuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "Heinäkuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "Elokuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "Syyskuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "Lokakuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "Marraskuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "Joulukuu"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-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:1219
-msgid "Select _Today"
-msgstr "Valitse _tämä päivä"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
-msgid "Memo"
-msgstr "Muistilappu"
-
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "Tulosta tämä muistilappu"
-
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "Muistilapun aloitusaika on mennyt"
-
-#: ../calendar/gui/dialogs/memo-page.c:460
-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:464
-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:1168
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-msgid "_List:"
-msgstr "_Luettelo:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "_Järjestäjä:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "Vastaan_ottajat:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../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:23
-msgid "Su_mmary:"
-msgstr "_Yhteenveto:"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "Vain tätä kertaa"
-
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "Tätä ja edellisiä kertoja"
-
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "Tätä ja tulevia kertoja"
-
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "Kaikki kerrat"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-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:1005
-msgid "Recurrence date is invalid"
-msgstr "Toistuvuuden päiväys on virheellinen"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-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:1078
-msgid "on"
-msgstr "Käytössä"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
-msgid "first"
-msgstr "ensimmäinen"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
-msgid "second"
-msgstr "toinen"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
-msgid "third"
-msgstr "kolmas"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1175
-msgid "fourth"
-msgstr "neljäs"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
-msgid "fifth"
-msgstr "viides"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1185
-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:1209
-msgid "Other Date"
-msgstr "Toinen päiväys"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1215
-msgid "1st to 10th"
-msgstr "1. - 10."
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1221
-msgid "11th to 20th"
-msgstr "11. - 20."
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1227
-msgid "21st to 31st"
-msgstr "21. - 31."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "Monday"
-msgstr "Maanantai"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Tuesday"
-msgstr "Tiistai"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Wednesday"
-msgstr "Keskiviikko"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1257
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Thursday"
-msgstr "Torstai"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1258
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Friday"
-msgstr "Perjantai"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1259
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "Saturday"
-msgstr "Lauantai"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1260
-#: ../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:1391
-msgid "on the"
-msgstr "seuraavasti:"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1576
-msgid "occurrences"
-msgstr "tapahtumiskertaa"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2346
-msgid "Add exception"
-msgstr "Lisää poikkeus"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2388
-msgid "Could not get a selection to modify."
-msgstr "Valintaa ei voi hakea muokattavaksi."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2394
-msgid "Modify exception"
-msgstr "Muokkaa poikkeusta"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2440
-msgid "Could not get a selection to delete."
-msgstr "Valintaa ei voitu hakea poistettavaksi."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2581
-msgid "Date/Time"
-msgstr "Päiväys/aika"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "päivä"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "viikko"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "kuukausi"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "vuosi"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
-msgid "for"
-msgstr "kerrat"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
-msgid "until"
-msgstr "kunnes"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
-msgid "forever"
-msgstr "ikuisesti"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "Tapaaminen on _toistuva"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "Joka"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgid "Exceptions"
-msgstr "Poikkeukset"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "Esikatselu"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-#, fuzzy
-msgid "Send my reminders with this event"
-msgstr "Lähetä hälytys tälle tapahtumalle"
-
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "Muistuta uusia osallistuja _vain"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "_Lähetysasetukset"
-
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "Tehtävä"
-
-#: ../calendar/gui/dialogs/task-editor.c:285
-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:1013
-msgid "Due date is wrong"
-msgstr "Eräpäivä on virheellinen"
-
-#: ../calendar/gui/dialogs/task-page.c:1181
-#: ../calendar/gui/dialogs/task-page.c:1206
-msgid "Completed date is wrong"
-msgstr "Valmistumispäivä on väärin"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
-msgid "High"
-msgstr "Korkea"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-cal-model.c:1856 ../calendar/gui/e-task-table.c:525
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:312
-msgid "Normal"
-msgstr "Tavallinen"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:342
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
-msgid "Low"
-msgstr "Matala"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "Määrittämätön"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
-msgid "Not Started"
-msgstr "Ei aloitettu"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3576
-msgid "In Progress"
-msgstr "Työn alla"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
-msgid "Completed"
-msgstr "Valmis"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "Peruutettu"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "_Eräpäivä:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "Aikavyöhyke:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "_Tila:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "_Valmistumispäivä:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "Pros_enttia valmiina:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "_Prioriteetti:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "Lu_okittelu:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "_Kotisivun osoite:"
-
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: ../calendar/gui/ea-cal-view.c:288
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
@@ -4401,7 +3131,7 @@ msgstr "Hyppäyspainike"
 msgid "Click here, you can find more events."
 msgstr "Napsauta tästä, voit löytää lisää tapahtumia."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d days before start"
 #: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
@@ -4409,7 +3139,7 @@ msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
@@ -4417,55 +3147,105 @@ msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
-#: ../calendar/gui/e-alarm-list.c:438
+#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+#| msgid "Play a sound"
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "Toista ääni"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+#| msgid "Pop up an alert"
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "Ponnahdusikkuna hälytykselle"
+
+#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:429
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+#| msgid "Send an email"
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "Lähetä sähköposti"
+
+#. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:433
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+#| msgid "Run a program"
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "Suorita ohjelma"
+
+#: ../calendar/gui/e-alarm-list.c:439
+#| msgid "Unknown action to be performed"
+msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s ennen tapaamisen alkua"
+#| msgid "%s %s before the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s ennen alkua"
 
-#: ../calendar/gui/e-alarm-list.c:459
+#: ../calendar/gui/e-alarm-list.c:460
 #, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s tapaamisen alun jälkeen"
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s alun jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:466
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s tapaamisen alussa"
+#: ../calendar/gui/e-alarm-list.c:467
+#, fuzzy, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "Liite: %s"
 
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s ennen tapaamisen loppumista"
+#| msgid "%s %s before the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s ennen loppumista"
 
-#: ../calendar/gui/e-alarm-list.c:484
+#: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s tapaamisen päättymisen jälkeen"
+#| msgid "%s %s after the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s 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:491
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s tapaamisen lopussa"
+#: ../calendar/gui/e-alarm-list.c:492
+#, fuzzy, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "Liite: %s"
 
 #. 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:515
-#, c-format
+#: ../calendar/gui/e-alarm-list.c:516
+#, fuzzy, c-format
+#| msgid "%s at %s"
+msgctxt "cal-reminders"
 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:523
-#, c-format
+#: ../calendar/gui/e-alarm-list.c:524
+#, fuzzy, c-format
+#| msgid "%s for an unknown trigger type"
+msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipaisintyypille"
 
@@ -4487,47 +3267,102 @@ msgstr "kalenterin kuukausinäkymä"
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:768
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:256
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:273
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-component-preview.c:286
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../modules/itip-formatter/itip-view.c:1517
 #: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3582
+msgid "In Progress"
+msgstr "Työn alla"
+
+#: ../calendar/gui/e-cal-component-preview.c:305
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:379
+msgid "Completed"
+msgstr "Valmis"
+
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:963
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr "Ei aloitettu"
+
+#: ../calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:316
+msgid "High"
+msgstr "Korkea"
+
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:315
+msgid "Normal"
+msgstr "Tavallinen"
+
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:314
+msgid "Low"
+msgstr "Matala"
+
+#: ../calendar/gui/e-cal-component-preview.c:350
 #: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:392
+#: ../calendar/gui/e-cal-component-preview.c:381
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
@@ -4549,112 +3384,175 @@ msgstr "Avataan tehtävälistaa '%s'"
 msgid "Creating view for memo list '%s'"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "Lisää tehtävä tästä"
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
+msgid "Destination is read only"
+msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "Aloituspäivä"
+#: ../calendar/gui/e-cal-dialogs.c:294
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Kopioidaan tapahtumia kalenteriin '%s'"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:670
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:157
-msgid "Type"
-msgstr "Tyyppi"
+#: ../calendar/gui/e-cal-dialogs.c:300
+#, fuzzy, c-format
+#| msgid "Delete memo list '{0}'?"
+msgid "Copying memos to the memo list '%s'"
+msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "Valmistumispäivä"
+#: ../calendar/gui/e-cal-dialogs.c:306
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Kopioidaan tehtäviä tehtävälistaan '%s'"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
-msgid "Complete"
-msgstr "Valmis"
+#: ../calendar/gui/e-cal-dialogs.c:525
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "Eräpäivä"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "_Poista kommentti"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% valmiina"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "Valitse päivämäärä"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "Prioriteetti"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+msgstr "Valitse _tämä päivä"
 
-#. 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:3845
-#: ../calendar/gui/e-meeting-list-view.c:713
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
-msgid "Status"
-msgstr "Tila"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "Tammikuu"
 
-#: ../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:380
-msgid "Created"
-msgstr "Luotu"
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "Helmikuu"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "Viimeksi muokattu"
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "Maaliskuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "Huhtikuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "Toukokuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "Kesäkuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "Heinäkuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "Elokuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "Syyskuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "Lokakuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "Marraskuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "Joulukuu"
+
+#: ../calendar/gui/e-cal-dialogs.c:868
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
+
+#: ../calendar/gui/e-cal-dialogs.c:870
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
+
+#: ../calendar/gui/e-cal-dialogs.c:874
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
+
+#: ../calendar/gui/e-cal-dialogs.c:878
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
+
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "Vain tätä kertaa"
+
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "Tätä ja edellisiä kertoja"
+
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "Tätä ja tulevia kertoja"
+
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "Kaikki kerrat"
+
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+#, fuzzy
+msgid "Send my reminders with this event"
+msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "Muistuta uusia osallistuja _vain"
+
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:465
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:471
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../calendar/gui/e-calendar-view.c:477
+#: ../calendar/gui/e-calendar-view.c:470
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../calendar/gui/e-calendar-view.c:859
+#: ../calendar/gui/e-calendar-view.c:852
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
-#| msgid "Default User Calendar"
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
-#| msgid "Mark as default task list"
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
-#: ../calendar/gui/e-calendar-view.c:969
+#: ../calendar/gui/e-calendar-view.c:962
 msgid "No suitable component found"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1039
+#: ../calendar/gui/e-calendar-view.c:1032
 #, fuzzy
 #| msgid "Save as iCalendar"
 msgid "Pasting iCalendar data"
@@ -4663,7 +3561,7 @@ msgstr "Tallenna iCalendar-muodossa"
 #. 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:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4672,29 +3570,29 @@ 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:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1862
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1850
+#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1902
+#: ../calendar/gui/e-calendar-view.c:1890
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2281
-#: ../calendar/gui/e-calendar-view.c:2288
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-calendar-view.c:2298
+#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -4703,13 +3601,13 @@ msgstr "%e. %Bta %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
-#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%e. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2308
+#: ../calendar/gui/e-calendar-view.c:2296
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -4719,15 +3617,15 @@ msgstr "%A %e. %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/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
-#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a %e. %bta"
 
-#: ../calendar/gui/e-calendar-view.c:2315
-#: ../calendar/gui/e-calendar-view.c:2321
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-calendar-view.c:2309
+#: ../calendar/gui/e-calendar-view.c:2312
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
@@ -4740,102 +3638,131 @@ msgstr "Aloituspäivä"
 msgid "End Date"
 msgstr "Päättymispäivä"
 
-#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-task-table.etspec.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "Luotu"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "Viimeksi muokattu"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:8
+#: ../calendar/gui/e-task-table.etspec.h:15
+#: ../em-format/e-mail-formatter-source.c:120
+msgid "Source"
+msgstr "Lähde"
+
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
-#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3604
 #: ../modules/itip-formatter/itip-view.c:6218
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
-#: ../calendar/gui/e-cal-ops.c:1232
-#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#: ../calendar/gui/e-cal-model.c:1404 ../calendar/gui/e-cal-ops.c:615
+#: ../calendar/gui/e-cal-ops.c:1251
+#: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
-#: ../calendar/gui/e-cal-ops.c:1349
-#| msgid "Create a new all day event"
+#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
+#: ../calendar/gui/e-cal-ops.c:1368
 msgid "Creating an event"
 msgstr "Luodaan tapahtuma"
 
-#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
-#: ../calendar/gui/e-cal-ops.c:1353
+#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
+#: ../calendar/gui/e-cal-ops.c:1372
 #, fuzzy
 #| msgid "Create a Mem_o"
 msgid "Creating a memo"
 msgstr "Luo _muistilappu"
 
-#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
-#: ../calendar/gui/e-cal-ops.c:1357
-#| msgid "Create a _Task"
+#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
+#: ../calendar/gui/e-cal-ops.c:1376
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
-#: ../calendar/gui/e-cal-model.c:1858
+#: ../calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1860
+#: ../calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:3786
+#: ../calendar/gui/e-cal-model.c:3820
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../modules/itip-formatter/itip-view.c:6206
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-cal-model.c:3787
+#: ../calendar/gui/e-cal-model.c:3821
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 #: ../modules/itip-formatter/itip-view.c:6212
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-cal-model.c:3788
+#: ../calendar/gui/e-cal-model.c:3822
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-cal-model.c:3789
+#: ../calendar/gui/e-cal-model.c:3823
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../modules/itip-formatter/itip-view.c:6215
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-cal-model.c:3790
+#: ../calendar/gui/e-cal-model.c:3824
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../calendar/gui/e-cal-model-calendar.c:151
+#. 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-cal-model.c:3879
+#: ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
+#: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Tila"
+
+#: ../calendar/gui/e-cal-model-calendar.c:150
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-cal-model-calendar.c:153
 #: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Varattu"
@@ -4856,37 +3783,35 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:306
 msgid "Modifying an event"
 msgstr "Muokataan tapahtumaa"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:310
 #, fuzzy
 #| msgid "Missing name."
 msgid "Modifying a memo"
 msgstr "Nimi puuttuu."
 
-#: ../calendar/gui/e-cal-ops.c:295
+#: ../calendar/gui/e-cal-ops.c:314
 msgid "Modifying a task"
 msgstr ""
 
-#: ../calendar/gui/e-cal-ops.c:394
-#| msgid "Removing attachments"
+#: ../calendar/gui/e-cal-ops.c:413
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../calendar/gui/e-cal-ops.c:398
+#: ../calendar/gui/e-cal-ops.c:417
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../calendar/gui/e-cal-ops.c:402
-#| msgid "Removing attachments"
+#: ../calendar/gui/e-cal-ops.c:421
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
-#: ../calendar/gui/e-cal-ops.c:493
+#: ../calendar/gui/e-cal-ops.c:512
 #, fuzzy, c-format
 #| msgid "Meeting information sent"
 msgid "Deleting an event"
@@ -4894,7 +3819,7 @@ msgid_plural "Deleting %d events"
 msgstr[0] "Kokouksen tiedot lähetetty"
 msgstr[1] "Kokouksen tiedot lähetetty"
 
-#: ../calendar/gui/e-cal-ops.c:497
+#: ../calendar/gui/e-cal-ops.c:516
 #, fuzzy, c-format
 #| msgid "Delete Memo"
 msgid "Deleting a memo"
@@ -4902,7 +3827,7 @@ msgid_plural "Deleting %d memos"
 msgstr[0] "Poista muistilappu"
 msgstr[1] "Poista muistilappu"
 
-#: ../calendar/gui/e-cal-ops.c:501
+#: ../calendar/gui/e-cal-ops.c:520
 #, fuzzy, c-format
 #| msgid "Delete Task"
 msgid "Deleting a task"
@@ -4910,7 +3835,7 @@ msgid_plural "Deleting %d tasks"
 msgstr[0] "Poista tehtävä"
 msgstr[1] "Poista tehtävä"
 
-#: ../calendar/gui/e-cal-ops.c:704
+#: ../calendar/gui/e-cal-ops.c:723
 #, fuzzy, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
@@ -4918,7 +3843,7 @@ msgid_plural "Pasting %d events"
 msgstr[0] "Tulosta tämä tapahtuma"
 msgstr[1] "Tulosta tämä tapahtuma"
 
-#: ../calendar/gui/e-cal-ops.c:719
+#: ../calendar/gui/e-cal-ops.c:738
 #, fuzzy, c-format
 #| msgid "Print this memo"
 msgid "Pasting a memo"
@@ -4926,7 +3851,7 @@ msgid_plural "Pasting %d memos"
 msgstr[0] "Tulosta tämä muistilappu"
 msgstr[1] "Tulosta tämä muistilappu"
 
-#: ../calendar/gui/e-cal-ops.c:734
+#: ../calendar/gui/e-cal-ops.c:753
 #, fuzzy, c-format
 #| msgid "Print this task"
 msgid "Pasting a task"
@@ -4934,92 +3859,92 @@ msgid_plural "Pasting %d tasks"
 msgstr[0] "Tulosta tämä tehtävä"
 msgstr[1] "Tulosta tämä tehtävä"
 
-#: ../calendar/gui/e-cal-ops.c:833
+#: ../calendar/gui/e-cal-ops.c:852
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating an event"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-cal-ops.c:837
+#: ../calendar/gui/e-cal-ops.c:856
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a memo"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-cal-ops.c:841
+#: ../calendar/gui/e-cal-ops.c:860
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-cal-ops.c:949
+#: ../calendar/gui/e-cal-ops.c:968
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../calendar/gui/e-cal-ops.c:953
+#: ../calendar/gui/e-cal-ops.c:972
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/e-cal-ops.c:957
+#: ../calendar/gui/e-cal-ops.c:976
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../calendar/gui/e-cal-ops.c:983
+#: ../calendar/gui/e-cal-ops.c:1002
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Purging events in the calendar '%s'"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../calendar/gui/e-cal-ops.c:987
+#: ../calendar/gui/e-cal-ops.c:1006
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Purging memos in the memo list '%s'"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../calendar/gui/e-cal-ops.c:991
+#: ../calendar/gui/e-cal-ops.c:1010
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Purging tasks in the task list '%s'"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../calendar/gui/e-cal-ops.c:1091
+#: ../calendar/gui/e-cal-ops.c:1110
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "Tyhjennetään"
 
-#: ../calendar/gui/e-cal-ops.c:1095
+#: ../calendar/gui/e-cal-ops.c:1114
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "Tulosta muistilaput"
 
-#: ../calendar/gui/e-cal-ops.c:1099
+#: ../calendar/gui/e-cal-ops.c:1118
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../calendar/gui/e-cal-ops.c:1201
+#: ../calendar/gui/e-cal-ops.c:1220
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../calendar/gui/e-cal-ops.c:2062
+#: ../calendar/gui/e-cal-ops.c:2051
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-cal-ops.c:2063
+#: ../calendar/gui/e-cal-ops.c:2052
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying an event"
@@ -5027,7 +3952,7 @@ msgid_plural "Copying %d events"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../calendar/gui/e-cal-ops.c:2069
+#: ../calendar/gui/e-cal-ops.c:2058
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a memo"
@@ -5035,7 +3960,7 @@ msgid_plural "Moving %d memos"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../calendar/gui/e-cal-ops.c:2070
+#: ../calendar/gui/e-cal-ops.c:2059
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a memo"
@@ -5043,7 +3968,7 @@ msgid_plural "Copying %d memos"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../calendar/gui/e-cal-ops.c:2076
+#: ../calendar/gui/e-cal-ops.c:2065
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a task"
@@ -5051,7 +3976,7 @@ msgid_plural "Moving %d tasks"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../calendar/gui/e-cal-ops.c:2077
+#: ../calendar/gui/e-cal-ops.c:2066
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a task"
@@ -5078,17 +4003,1338 @@ msgstr ""
 "Päiväys täytyy antaa seuraavassa muodossa: \n"
 "%s"
 
+#: ../calendar/gui/e-comp-editor-event.c:101
+#, fuzzy
+#| msgid "Event's start time is in the past"
+msgid "Event's time is in the past"
+msgstr "Tapahtuman aloitusaika on mennyt"
+
+#: ../calendar/gui/e-comp-editor-event.c:202
+#, fuzzy
+#| msgid "Event cannot be edited, because the selected calendar is read only"
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
+
+#: ../calendar/gui/e-comp-editor-event.c:204
+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/e-comp-editor-event.c:206
+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/e-comp-editor-event.c:350
+#: ../calendar/gui/e-comp-editor-task.c:348
+#| msgid "Start date is wrong"
+msgid "Start date is not a valid date"
+msgstr "Aloituspäiväys on virheellinen"
+
+#: ../calendar/gui/e-comp-editor-event.c:352
+#| msgid "Start time is wrong"
+msgid "Start time is not a valid time"
+msgstr "Alkamisaika on virheellinen"
+
+#: ../calendar/gui/e-comp-editor-event.c:356
+#: ../calendar/gui/e-comp-editor-event.c:372
+#: ../calendar/gui/e-comp-editor-page-attachments.c:211
+#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
+#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
+#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:991 ../shell/e-shell.c:1013
+#: ../smime/gui/certificate-manager.c:346
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: ../calendar/gui/e-comp-editor-event.c:366
+#, fuzzy
+#| msgid "The calendar attached is not valid"
+msgid "End date is not a valid date"
+msgstr "Liitetty kalenteri ei ole kelvollinen"
+
+#: ../calendar/gui/e-comp-editor-event.c:368
+#, fuzzy
+#| msgid "Chosen file is not a local file."
+msgid "End time is not a valid time"
+msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
+
+#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-memo.c:106
+#: ../calendar/gui/e-comp-editor-task.c:406
+msgid "_Categories"
+msgstr "_Luokat"
+
+#: ../calendar/gui/e-comp-editor-event.c:492
+#: ../calendar/gui/e-comp-editor-memo.c:108
+#: ../calendar/gui/e-comp-editor-task.c:408
+msgid "Toggles whether to display categories"
+msgstr "Määrittää näytetäänkö luokat"
+
+#: ../calendar/gui/e-comp-editor-event.c:498
+msgid "Time _Zone"
+msgstr "_Aikavyöhyke"
+
+#: ../calendar/gui/e-comp-editor-event.c:500
+msgid "Toggles whether the time zone is displayed"
+msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
+
+#: ../calendar/gui/e-comp-editor-event.c:506
+msgid "All _Day Event"
+msgstr "Koko _päivän tapahtuma"
+
+#: ../calendar/gui/e-comp-editor-event.c:508
+msgid "Toggles whether to have All Day Event"
+msgstr "Määrittää onko tämä koko päivän tapahtuma"
+
+#: ../calendar/gui/e-comp-editor-event.c:514
+msgid "Show Time as _Busy"
+msgstr "Näytä aika _varattuna"
+
+#: ../calendar/gui/e-comp-editor-event.c:516
+msgid "Toggles whether to show time as busy"
+msgstr "Määrittää näytetäänkö aika varattuna"
+
+#: ../calendar/gui/e-comp-editor-event.c:525
+msgid "Pu_blic"
+msgstr "J_ulkinen"
+
+#: ../calendar/gui/e-comp-editor-event.c:527
+msgid "Classify as public"
+msgstr "Luokittele julkiseksi"
+
+#: ../calendar/gui/e-comp-editor-event.c:532
+msgid "_Private"
+msgstr "_Yksityinen"
+
+#: ../calendar/gui/e-comp-editor-event.c:534
+msgid "Classify as private"
+msgstr "Luokittele yksityiseksi"
+
+#: ../calendar/gui/e-comp-editor-event.c:539
+msgid "_Confidential"
+msgstr "_Luottamuksellinen"
+
+#: ../calendar/gui/e-comp-editor-event.c:541
+msgid "Classify as confidential"
+msgstr "Luokittele luottamukselliseksi"
+
+#: ../calendar/gui/e-comp-editor-event.c:642
+#| msgid "_Start time:"
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
+
+#: ../calendar/gui/e-comp-editor-event.c:647
+#| msgid "_End time:"
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "_Loppumisaika:"
+
+#: ../calendar/gui/e-comp-editor-event.c:657
+#| msgid "All _Day Event"
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "Koko _päivän tapahtuma"
+
+#: ../calendar/gui/e-comp-editor-event.c:710
+#: ../calendar/gui/e-comp-editor-memo.c:192
+#: ../calendar/gui/e-comp-editor-task.c:529
+#| msgid "General"
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "Yleiset"
+
+#: ../calendar/gui/e-comp-editor-event.c:713
+#: ../calendar/gui/e-comp-editor-task.c:535
+#, fuzzy
+#| msgid "Reminders"
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "Muistutukset"
+
+#: ../calendar/gui/e-comp-editor-event.c:716
+#, fuzzy
+#| msgid "Recurrence"
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "Toistuvuus"
+
+#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+#| msgid "Attachments"
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "Liitteet"
+
+#: ../calendar/gui/e-comp-editor-event.c:729
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr ""
+
+#: ../calendar/gui/e-comp-editor-event.c:758
+#, c-format
+msgid "Meeting - %s"
+msgstr "Kokous - %s"
+
+#: ../calendar/gui/e-comp-editor-event.c:759
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:68
+#, fuzzy
+#| msgid "Memo cannot be edited, because the selected memo list is read only"
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr ""
+"Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain "
+"lukutilassa"
+
+#: ../calendar/gui/e-comp-editor-memo.c:70
+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/e-comp-editor-memo.c:72
+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/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "_Luettelo:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+#| msgid "Sta_rt date:"
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "_Alkamispäivä:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, fuzzy, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Memo - %s"
+msgstr "Tehtävänanto - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+msgstr "Muistilappu - %s"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:125
+#: ../calendar/gui/e-comp-editor-page-attachments.c:130
+#: ../em-format/e-mail-formatter-attachment.c:424
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Liite"
+msgstr[1] "Liitteet"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../e-util/e-attachment.c:2542
+#, c-format
+msgid "Could not load '%s'"
+msgstr "%s ei voitu ladata"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:208
+#: ../e-util/e-attachment.c:2545
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Liitettä ei voitu avata"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#, fuzzy
+#| msgid ""
+#| "Some attachments are being downloaded. Saving the task would result in "
+#| "the loss of these attachments."
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr ""
+"Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
+"aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#, c-format
+msgid "Attachment '%s' cannot be found, remove it from the list, please"
+msgstr ""
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#, c-format
+msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+msgstr ""
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:618
+#: ../composer/e-composer-actions.c:327
+msgid "_Attachment..."
+msgstr "_Liite..."
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:620
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+msgid "Attach a file"
+msgstr "Liitä tiedosto viestiin"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+#| msgid "Attachments"
+msgid "_Attachments"
+msgstr "_Liitteet"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+#| msgctxt "iCalImp"
+#| msgid "has attachments"
+msgid "Show attachments"
+msgstr "Näytä liitteet"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:781
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+msgid "Icon View"
+msgstr "Kuvakenäkymä"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:783
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+msgid "List View"
+msgstr "Luettelonäkymä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:313
+#, fuzzy, c-format
+#| msgid "Cannot find matching event in the next %d year"
+#| msgid_plural "Cannot find matching event in the next %d years"
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr ""
+
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "Yhteystiedon poisto epäonnistui"
+msgstr[1] "Yhteystiedon poisto epäonnistui"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+#| msgid "Attendees"
+msgid "A_ttendees"
+msgstr "_Osanottajat"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+#, fuzzy
+#| msgid "Toggles whether the Attendee Type is displayed"
+msgid "Toggles whether the Attendees are displayed"
+msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "R_oolikenttä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "Määrittää näytetäänkö roolikenttä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Määrittää näytetäänkö RSVP-kenttä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "_Tilakenttä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "Määrittää näytetäänkö tilakenttä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "T_yyppikenttä"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "Järjestäjä vaaditaan."
+
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "Vähintään yksi läsnäolija vaaditaan."
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "_Järjestäjä:"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1288
+#| msgid "Atte_ndees..."
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "_Osanottajat..."
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+msgid "Add exception"
+msgstr "Lisää poikkeus"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+msgid "Modify exception"
+msgstr "Muokkaa poikkeusta"
+
+#. 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/e-comp-editor-page-recurrence.c:489
+msgid "on"
+msgstr "Käytössä"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+#, fuzzy
+#| msgid "first"
+msgctxt "ECompEditorPageRecur"
+msgid "first"
+msgstr "ensimmäinen"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+#, fuzzy
+#| msgid "second"
+msgctxt "ECompEditorPageRecur"
+msgid "second"
+msgstr "toinen"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+#, fuzzy
+#| msgid "third"
+msgctxt "ECompEditorPageRecur"
+msgid "third"
+msgstr "kolmas"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+#, fuzzy
+#| msgid "fourth"
+msgctxt "ECompEditorPageRecur"
+msgid "fourth"
+msgstr "neljäs"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+#, fuzzy
+#| msgid "fifth"
+msgctxt "ECompEditorPageRecur"
+msgid "fifth"
+msgstr "viides"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#, fuzzy
+#| msgid "last"
+msgctxt "ECompEditorPageRecur"
+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/e-comp-editor-page-recurrence.c:623
+#, fuzzy
+#| msgid "Other Date"
+msgctxt "ECompEditorPageRecur"
+msgid "Other Date"
+msgstr "Toinen päiväys"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+#, fuzzy
+#| msgid "1st to 10th"
+msgctxt "ECompEditorPageRecur"
+msgid "1st to 10th"
+msgstr "1. - 10."
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+#, fuzzy
+#| msgid "11th to 20th"
+msgctxt "ECompEditorPageRecur"
+msgid "11th to 20th"
+msgstr "11. - 20."
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#, fuzzy
+#| msgid "21st to 31st"
+msgctxt "ECompEditorPageRecur"
+msgid "21st to 31st"
+msgstr "21. - 31."
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+#, fuzzy
+#| msgid "day"
+#| msgid_plural "days"
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "päivä"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#, fuzzy
+#| msgid "Monday"
+msgctxt "ECompEditorPageRecur"
+msgid "Monday"
+msgstr "Maanantai"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#, fuzzy
+#| msgid "Tuesday"
+msgctxt "ECompEditorPageRecur"
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#, fuzzy
+#| msgid "Wednesday"
+msgctxt "ECompEditorPageRecur"
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#, fuzzy
+#| msgid "Thursday"
+msgctxt "ECompEditorPageRecur"
+msgid "Thursday"
+msgstr "Torstai"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#, fuzzy
+#| msgid "Friday"
+msgctxt "ECompEditorPageRecur"
+msgid "Friday"
+msgstr "Perjantai"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#, fuzzy
+#| msgid "Saturday"
+msgctxt "ECompEditorPageRecur"
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#, fuzzy
+#| msgid "Sunday"
+msgctxt "ECompEditorPageRecur"
+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/e-comp-editor-page-recurrence.c:803
+#, fuzzy
+#| msgid "on the"
+msgctxt "ECompEditorPageRecur"
+msgid "on the"
+msgstr "seuraavasti:"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#, fuzzy
+#| msgid "occurrences"
+msgctxt "ECompEditorPageRecur"
+msgid "occurrences"
+msgstr "tapahtumiskertaa"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+#, fuzzy
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This appointment rec_urs"
+msgstr "Tapaaminen on _toistuva"
+
+#. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+#, fuzzy
+#| msgid "This task recurs"
+msgctxt "ECompEditorPageRecur"
+msgid "This task rec_urs"
+msgstr "Tehtävä on toistuva"
+
+#. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+#, fuzzy
+#| msgid "This memo recurs"
+msgctxt "ECompEditorPageRecur"
+msgid "This memo rec_urs"
+msgstr "Muistilappu on toistuva"
+
+#. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+#, fuzzy
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "Tapaaminen on _toistuva"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Recurrence exception date is invalid"
+msgstr "Toistuvuuden päiväys on virheellinen"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#, fuzzy
+#| msgid "End time of the recurrence was before event's start"
+msgid "End time of the recurrence is before the start"
+msgstr "Toistuvuuden päättymispäivä oli ennen tapahtuman alkua"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#, fuzzy
+#| msgid "Recurrence"
+msgid "R_ecurrence"
+msgstr "Toistuvuus"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "Set or unset recurrence"
+msgstr "Sisältää toistuvuuksia."
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+#, fuzzy
+#| msgid "Every"
+msgctxt "ECompEditorPageRecur"
+msgid "Every"
+msgstr "Joka"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+#, fuzzy
+#| msgid "day(s)"
+msgctxt "ECompEditorPageRecur"
+msgid "day(s)"
+msgstr "päivä(ä)"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "week(s)"
+msgctxt "ECompEditorPageRecur"
+msgid "week(s)"
+msgstr "viikko"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "month(s)"
+msgctxt "ECompEditorPageRecur"
+msgid "month(s)"
+msgstr "kuukausi"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "year(s)"
+msgctxt "ECompEditorPageRecur"
+msgid "year(s)"
+msgstr "vuosi"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+#, fuzzy
+#| msgctxt "eventpage"
+#| msgid "for"
+msgctxt "ECompEditorPageRecur"
+msgid "for"
+msgstr "kesto"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+#, fuzzy
+#| msgctxt "eventpage"
+#| msgid "until"
+msgctxt "ECompEditorPageRecur"
+msgid "until"
+msgstr "saakka"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "forever"
+msgctxt "ECompEditorPageRecur"
+msgid "forever"
+msgstr "ikuisesti"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../mail/mail-config.ui.h:62
+msgid "A_dd"
+msgstr "_Lisää"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../mail/mail-config.ui.h:64
+msgid "Re_move"
+msgstr "_Poista"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+msgid "Preview"
+msgstr "Esikatselu"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+#, fuzzy
+#| msgid "Send To:"
+msgid "Send To"
+msgstr "Lähetä:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+msgid "_Reminders"
+msgstr "_Muistutukset"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#, fuzzy
+#| msgid "Set or unset reminders for this event"
+msgid "Set or unset reminders"
+msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Reminders"
+msgstr "Muistutukset"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+msgid "_Reminder"
+msgstr "_Muistutus"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#, c-format
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d päivä ennen"
+msgstr[1] "%d päivää ennen"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#, c-format
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d tunti ennen"
+msgstr[1] "%d tuntia ennen"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#, c-format
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d minuutti ennen"
+msgstr[1] "%d minuuttia ennen"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Ei mitään"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#| msgid "15 minutes"
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "15 minuuttia ennen"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#| msgid "1 hour ago"
+#| msgid_plural "%d hours ago"
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "1 tunti ennen"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#| msgid "is before"
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "1 päivä ennen"
+
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#, fuzzy
+#| msgid "Custom"
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "Omavalintainen"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#, fuzzy
+#| msgid "minute(s)"
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "minuutti(a)"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#, fuzzy
+#| msgid "hour(s)"
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "tunti(a)"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#, fuzzy
+#| msgid "day(s)"
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "päivä(ä)"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#, fuzzy
+#| msgid "before"
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "ennen"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#, fuzzy
+#| msgid "after"
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "jälkeen"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#, fuzzy
+#| msgid "Start"
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "Alkaa"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#, fuzzy
+#| msgid "_Send"
+msgctxt "cal-reminders"
+msgid "end"
+msgstr "_Lähetä"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+#, fuzzy
+#| msgid "_Repeat the reminder"
+msgid "Re_peat the reminder"
+msgstr "_Toista muistutus"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+#, fuzzy
+#| msgid "extra times every"
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "ylimääräistä kertaa joka"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#, fuzzy
+#| msgid "minutes"
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "minuutti"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#, fuzzy
+#| msgid "hours"
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "tuntia"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#, fuzzy
+#| msgid "days"
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "päivä"
+
+#. page_reminders->priv->custom_email_entry is initialized on demand
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+#, fuzzy
+#| msgid "Custom _message"
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "Oma _viesti"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#, fuzzy
+#| msgid "Custom reminder sound"
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "Oma _hälytysääni muistutukselle"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#| msgid "Select sound file"
+msgid "Select a sound file"
+msgstr "Valitse äänitiedosto"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+msgid "_Program:"
+msgstr "_Ohjelma:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+msgid "_Arguments:"
+msgstr "_Argumentit:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#, fuzzy
+#| msgid "Send To:"
+msgid "_Send To:"
+msgstr "Lähetä:"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#, fuzzy
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule"
+msgstr "_Järjestä kokous..."
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+#, fuzzy
+#| msgid "_Summary:"
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "_Yhteenveto:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+#| msgid "_Location:"
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "_Sijainti:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+#, fuzzy
+#| msgid "Ca_tegories..."
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "Ry_hmät..."
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+#| msgid "_Description:"
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "K_uvaus:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+#| msgid "_Web Page:"
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "_Verkkosivusto:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+#, fuzzy
+#| msgid "D_ue date:"
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "_Eräpäivä:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+#, fuzzy
+#| msgid "Date _completed:"
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "_Valmistumispäivä:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+#| msgid "Public"
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "Julkinen"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+#| msgid "Private"
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "Yksityinen"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+#, fuzzy
+#| msgid "Confidential"
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "Luottamuksellinen"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1151
+#, fuzzy
+#| msgid "C_lassification:"
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "Lu_okittelu:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1170
+#| msgid "Not Started"
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "Ei aloitettu"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1171
+#| msgid "In Progress"
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "Työn alla"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1172
+#| msgid "Completed"
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "Valmis"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1173
+#| msgid "Canceled"
+msgctxt "ECompEditor"
+msgid "Canceled"
+msgstr "Peruttu"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1182
+#| msgid "_Status:"
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "_Tila:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1212
+#, fuzzy
+#| msgid "Undefined"
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "Määrittämätön"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1213
+#| msgid "High"
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "Korkea"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1214
+#| msgid "Normal"
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "Normaali"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1215
+#| msgid "Low"
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "Matala"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1224
+#| msgid "Priorit_y:"
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "_Prioriteetti:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1278
+#| msgid "_Percent complete:"
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "Prosenttia valmiina:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1359
+#| msgid "Time _zone:"
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "Aika_vyöhyke:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1484
+#, fuzzy
+#| msgid "Show Time as _Busy"
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "Näytä aika _varattuna"
+
+#: ../calendar/gui/e-comp-editor-task.c:75
+msgid "Task's start date is in the past"
+msgstr "Tehtävän aloitusaika on mennyt"
+
+#: ../calendar/gui/e-comp-editor-task.c:83
+msgid "Task's due date is in the past"
+msgstr "Tehtävän aloitusaika on mennyt"
+
+#: ../calendar/gui/e-comp-editor-task.c:308
+#, fuzzy
+#| msgid "Task cannot be edited, because the selected task list is read only"
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr ""
+"Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
+
+#: ../calendar/gui/e-comp-editor-task.c:310
+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/e-comp-editor-task.c:312
+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/e-comp-editor-task.c:359
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Due date is not a valid date"
+msgstr "Toistuvuuden päiväys on virheellinen"
+
+#: ../calendar/gui/e-comp-editor-task.c:370
+#, fuzzy
+#| msgid "Completed date is wrong"
+msgid "Completed date is not a valid date"
+msgstr "Valmistumispäivä on väärin"
+
+#: ../calendar/gui/e-comp-editor-task.c:381
+#, fuzzy
+#| msgid "1 minute in the future"
+#| msgid_plural "%d minutes in the future"
+msgid "Completed date cannot be in the future"
+msgstr "yhden minuutin päässä"
+
+#: ../calendar/gui/e-comp-editor-task.c:566
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tehtävänanto - %s"
+
+#: ../calendar/gui/e-comp-editor-task.c:567
+#, c-format
+msgid "Task - %s"
+msgstr "Tehtävä - %s"
+
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "liite"
+
+#: ../calendar/gui/e-comp-editor.c:609
+#, fuzzy
+#| msgid "Send _updates to attendees"
+msgid "Sending notifications to attendees..."
+msgstr "Lähetä _päivitykset osallistujille"
+
+#: ../calendar/gui/e-comp-editor.c:991
+#| msgid "_Save Changes"
+msgid "Saving changes..."
+msgstr "Tallennetaan muutoksia..."
+
+#: ../calendar/gui/e-comp-editor.c:1247
+msgid "No Summary"
+msgstr "Ei yhteenvetoa"
+
+#. == Button box ==
+#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
+#: ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:299
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
+#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
+#: ../mail/em-subscription-editor.c:1759
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
+#: ../smime/gui/certificate-manager.c:2068
+msgid "_Close"
+msgstr "_Sulje"
+
+#: ../calendar/gui/e-comp-editor.c:1974
+msgid "Close the current window"
+msgstr "Sulje nykyinen ikkuna"
+
+#. copy menu item
+#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
+msgid "_Copy"
+msgstr "_Kopioi"
+
+#: ../calendar/gui/e-comp-editor.c:1981 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
+#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:801
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
+
+#. cut menu item
+#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+msgid "Cu_t"
+msgstr "_Leikkaa"
+
+#: ../calendar/gui/e-comp-editor.c:1988 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
+#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
+
+#: ../calendar/gui/e-comp-editor.c:1995 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:815
+msgid "Delete the selection"
+msgstr "Poista valinta"
+
+#: ../calendar/gui/e-comp-editor.c:2002
+msgid "View help"
+msgstr "Näytä ohje"
+
+#. paste menu item
+#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+msgid "_Paste"
+msgstr "_Liitä"
+
+#: ../calendar/gui/e-comp-editor.c:2009 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
+#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+msgid "Paste the clipboard"
+msgstr "Liitä leikepöytä"
+
+#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
+#: ../mail/e-mail-reader.c:2287
+#: ../modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../modules/addressbook/e-book-shell-view-actions.c:1245
+msgid "_Print..."
+msgstr "T_ulosta..."
+
+#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
+msgid "Pre_view..."
+msgstr "E_sikatselu..."
+
+#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+msgid "Select _All"
+msgstr "Valitse _kaikki"
+
+#: ../calendar/gui/e-comp-editor.c:2030 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
+msgid "Select all text"
+msgstr "Valitse kaikki teksti"
+
+#: ../calendar/gui/e-comp-editor.c:2051
+msgid "_Classification"
+msgstr "Lu_okittelu"
+
+#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+msgid "_File"
+msgstr "_Tiedosto"
+
+#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+msgid "_Insert"
+msgstr "L_isää"
+
+#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+msgid "_Options"
+msgstr "_Asetukset"
+
+#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+msgid "_View"
+msgstr "_Näytä"
+
+#: ../calendar/gui/e-comp-editor.c:2105
+msgid "Save current changes"
+msgstr "Tallenna nykyiset muutokset"
+
+#: ../calendar/gui/e-comp-editor.c:2110
+#: ../e-util/e-mail-signature-editor.c:308 ../mail/e-mail-notes.c:912
+msgid "Save and Close"
+msgstr "Tallenna ja sulje"
+
+#: ../calendar/gui/e-comp-editor.c:2112
+msgid "Save current changes and close editor"
+msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
+#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
+#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
+#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
 msgid "pm"
 msgstr "pm"
 
@@ -5098,13 +5344,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:3019 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 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:3744
+#: ../calendar/gui/e-day-view.c:3742
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -5115,27 +5361,27 @@ 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:804
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
 
-#: ../calendar/gui/e-day-view-time-item.c:829
+#: ../calendar/gui/e-day-view-time-item.c:831
 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:846
-#: ../modules/calendar/e-calendar-preferences.c:308
-#: ../modules/calendar/e-calendar-preferences.c:360
+#: ../calendar/gui/e-day-view-time-item.c:848
+#: ../modules/calendar/e-calendar-preferences.c:303
+#: ../modules/calendar/e-calendar-preferences.c:355
 #: ../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:880
+#: ../calendar/gui/e-day-view-time-item.c:882
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:391
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "Valitse..."
 
@@ -5155,51 +5401,55 @@ msgstr "Vapaaehtoiset läsnäolijat"
 msgid "Resources"
 msgstr "Resurssit"
 
+#: ../calendar/gui/e-meeting-list-view.c:164
+msgid "Attendees"
+msgstr "Osanottajat"
+
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
@@ -5209,11 +5459,20 @@ msgstr "Ei läsnä"
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:699
+#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-task-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:591
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "Tyyppi"
+
+#: ../calendar/gui/e-meeting-list-view.c:674
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
@@ -5246,59 +5505,63 @@ msgstr "Poissa konttorilta"
 msgid "No Information"
 msgstr "Ei tietoa"
 
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "_Osanottajat..."
+
 #: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:594
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Näytä _etäämpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:625
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:711
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:732
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:800
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2721
+#: ../calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5307,7 +5570,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -5336,46 +5599,46 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1599
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-#: ../modules/calendar/e-memo-shell-view.c:308
+#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
+#: ../modules/calendar/e-cal-shell-content.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "Muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../calendar/gui/e-memo-table.c:683
+#: ../calendar/gui/e-memo-table.c:682
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:689
+#: ../calendar/gui/e-memo-table.c:688
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:695
+#: ../calendar/gui/e-memo-table.c:694
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../calendar/gui/e-memo-table.c:701
-#: ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../calendar/gui/e-memo-table.c:700
+#: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -5383,6 +5646,11 @@ msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Määrittämätön"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
@@ -5392,14 +5660,15 @@ msgstr "Lisää muistilappu tästä"
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1062
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1559
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-#: ../modules/calendar/e-task-shell-view.c:466
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1117
+#: ../data/evolution.desktop.in.in.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-cal-shell-content.c:1627
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "Tehtävät"
 
@@ -5416,7 +5685,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
 #: ../calendar/gui/e-task-table.c:1016
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
@@ -5424,6 +5693,36 @@ msgstr "Poista valitut tehtävät"
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
+#: ../calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Lisää tehtävä tästä"
+
+#: ../calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "Aloituspäivä"
+
+#: ../calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "Valmistumispäivä"
+
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+msgid "Complete"
+msgstr "Valmis"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "Eräpäivä"
+
+#: ../calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% valmiina"
+
+#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Priority"
+msgstr "Prioriteetti"
+
 #: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
@@ -5431,36 +5730,36 @@ 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:224 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:842
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:699
 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:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:942
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -5468,7 +5767,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:978
+#: ../calendar/gui/itip-utils.c:979
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -5477,7 +5776,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:985
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -5489,7 +5788,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:992 ../calendar/gui/itip-utils.c:1040
+#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -5498,7 +5797,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:999
+#: ../calendar/gui/itip-utils.c:1000
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -5506,7 +5805,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:1012
+#: ../calendar/gui/itip-utils.c:1013
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -5514,7 +5813,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:1019
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -5522,7 +5821,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:1026
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -5530,174 +5829,173 @@ 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:1033
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:1112
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../calendar/gui/itip-utils.c:1120
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:1148
+#: ../calendar/gui/itip-utils.c:1149
 #, c-format
 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:1153
-#| msgid "Unable to book a resource, error: %s"
+#: ../calendar/gui/itip-utils.c:1154
 msgid "Unable to book a resource, error: "
 msgstr "Resurssin varaaminen ei onnistu, virhe:"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/itip-utils.c:1918
+#: ../calendar/gui/itip-utils.c:1933
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending an event"
 msgstr "Lähetetään viestiä"
 
-#: ../calendar/gui/itip-utils.c:1922
+#: ../calendar/gui/itip-utils.c:1937
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../calendar/gui/itip-utils.c:1926
+#: ../calendar/gui/itip-utils.c:1941
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
 msgstr "Lähetys"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:670
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31."
 
@@ -5705,102 +6003,114 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "Ma"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "Ti"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "Ke"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "To"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:734
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "La"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:735
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3309
+#: ../calendar/gui/print.c:3315
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3341
 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:3342
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/print.c:3546
+#: ../calendar/gui/print.c:3492
+msgid "Appointment"
+msgstr "Tapaaminen"
+
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Tehtävä"
+
+#: ../calendar/gui/print.c:3496
+msgid "Memo"
+msgstr "Muistilappu"
+
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../calendar/gui/print.c:3590
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:3606
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:3638
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3652
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:3663
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -5823,185 +6133,209 @@ msgstr "on suurempi kuin"
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:452
-#: ../calendar/importers/icalendar-importer.c:891
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../modules/calendar/e-cal-base-shell-backend.c:183
+#: ../modules/calendar/e-cal-shell-view-actions.c:180
+msgid "New Calendar"
+msgstr "Uusi kalenteri"
+
+#: ../calendar/importers/icalendar-importer.c:315
+#: ../modules/calendar/e-cal-base-shell-backend.c:191
+#: ../modules/calendar/e-task-shell-view-actions.c:204
+msgid "New Task List"
+msgstr "Uusi tehtävälista"
+
+#: ../calendar/importers/icalendar-importer.c:357
+#| msgid "Create a new calendar"
+msgid "Cre_ate new calendar"
+msgstr "_Luo uusi kalenteri"
+
+#: ../calendar/importers/icalendar-importer.c:361
+#| msgid "Create a new task list"
+msgid "Cre_ate new task list"
+msgstr "Luo _uusi tehtävälista"
+
+#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:600
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:601
+#: ../calendar/importers/icalendar-importer.c:656
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:693
+#: ../calendar/importers/icalendar-importer.c:748
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:777
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:778
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1110
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:1098
-msgid "Gnome Calendar"
-msgstr "Gnome-kalenteri"
+#: ../calendar/importers/icalendar-importer.c:1153
+#, fuzzy
+#| msgid "New Calendar"
+msgid "GNOME Calendar"
+msgstr "Uusi kalenteri"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1154
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../calendar/importers/icalendar-importer.c:1173
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/importers/icalendar-importer.c:1176
-#: ../calendar/importers/icalendar-importer.c:1486
+#: ../calendar/importers/icalendar-importer.c:1231
+#: ../calendar/importers/icalendar-importer.c:1541
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1255
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1213
+#: ../calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1278
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1234
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1242
-#: ../calendar/importers/icalendar-importer.c:1523
+#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1578
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1253
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1265
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1330
 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:1299
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../calendar/importers/icalendar-importer.c:1362
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1318
-#: ../calendar/importers/icalendar-importer.c:1321
+#: ../calendar/importers/icalendar-importer.c:1373
+#: ../calendar/importers/icalendar-importer.c:1376
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1341
-#: ../calendar/importers/icalendar-importer.c:1344
+#: ../calendar/importers/icalendar-importer.c:1396
+#: ../calendar/importers/icalendar-importer.c:1399
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1413
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../calendar/importers/icalendar-importer.c:1518
+#: ../calendar/importers/icalendar-importer.c:1573
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -7571,7 +7905,7 @@ msgstr "Uusi _viesti"
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1208
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Asetukset"
@@ -7676,12 +8010,14 @@ msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 #, fuzzy
 #| msgid "Unicode"
-msgid "Unicode smileys"
+msgid "Unicode emoticons"
 msgstr "Unicode"
 
 #: ../composer/e-composer-actions.c:525
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for smileys."
+#, fuzzy
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Unicode characters for emoticons."
 msgstr "Käytä Unicode-merkkejä hymiöitä varten."
 
 #: ../composer/e-composer-actions.c:531
@@ -7720,6 +8056,10 @@ msgstr "_Vastausosoite-kenttä"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
+#: ../composer/e-composer-actions.c:612
+msgid "Attach"
+msgstr "Liitä tiedosto"
+
 #: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
@@ -7727,8 +8067,8 @@ msgstr "Tallenna luonnos"
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -7777,7 +8117,7 @@ msgid "S_ubject:"
 msgstr "_Aihe:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:504
+#: ../mail/e-mail-config-identity-page.c:516
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
@@ -7789,7 +8129,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-msg-composer.c:872
+#: ../composer/e-msg-composer.c:874
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7797,7 +8137,7 @@ msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:881
+#: ../composer/e-msg-composer.c:883
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7806,11 +8146,12 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2367
+#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4710
+#: ../composer/e-msg-composer.c:4995
 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)"
@@ -7861,24 +8202,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Automaattinen tallennus epäonnistui: &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Tietojen haku kesken. Haluatko lähettää viestin?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Joidenkin liitteiden lataus on vielä kesken. Viestin lähettäminen aiheuttaa "
-"viestin lähetyksen ilman näitä keskeneräisiä liitteitä "
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Haluatko todella hylätä viestin otsikolla '{0}', vaikka muokkaat sitä?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7889,58 +8218,55 @@ msgstr ""
 "voi jatkaa myöhemmin."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "_Jatka muokkausta"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "Tallenna _luonnos"
 
-#: ../composer/mail-composer.error.xml.h:20
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Haluatko varmasti hylätä kirjoittamasi viestin?"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Viestiä ei voi luoda."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:19
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "&quot;{0}&quot; johtuen sinun täytyy ehkä valita eri sähköpostiasetukset."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "Kaikki tilit on poistettu."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:23
 #, fuzzy
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:24
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei lähetetty."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:25
 #, fuzzy
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:26
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
@@ -7948,71 +8274,70 @@ msgstr ""
 "Ilmoitettu virhe oli &quot;{0}&quot;. Viestiä ei mitä luultavimmin ole "
 "tallennettu."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:27
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Lähettäessä tapahtui virhe. Kuinka haluat jatkaa?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Ilmoitettu virhe oli &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:29
 #, fuzzy
 msgid "_Save to Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:31
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Viestisi lähetettiin, mutta jälkikäsittelyn yhteydessä tapahtui virhe."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:32
 #, fuzzy
 msgid "Saving message to Outbox."
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../composer/mail-composer.error.xml.h:36
+#: ../composer/mail-composer.error.xml.h:33
 msgid ""
 "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 ""
 
-#: ../composer/mail-composer.error.xml.h:37
-#, fuzzy
+#: ../composer/mail-composer.error.xml.h:34
 #| 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?"
 msgid "Are you sure you want to send the message?"
-msgstr "Haluatko varmasti avata %d viestin kerralla?"
+msgstr "Haluatko varmasti lähettää tämän viestin?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../composer/mail-composer.error.xml.h:35
 msgid ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:39
+#: ../composer/mail-composer.error.xml.h:37
 #, fuzzy
 #| msgid "Are you sure you want to delete this memo?"
 msgid "Are you sure you want to change the composer mode?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:38
 msgid ""
 "Turning HTML mode off will cause the text to lose all formatting. Do you "
 "want to continue?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:41
+#: ../composer/mail-composer.error.xml.h:39
 #, fuzzy
 #| msgid "Address formatting"
 msgid "_Don't lose formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../composer/mail-composer.error.xml.h:42
+#: ../composer/mail-composer.error.xml.h:40
 #, fuzzy
 #| msgid "Address formatting"
 msgid "Lose _formatting"
@@ -8026,7 +8351,8 @@ msgstr "Evolutionin hälytysilmoitukset"
 msgid "Calendar event notifications"
 msgstr "Kalenteritapahtumien ilmoitukset"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1118
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8040,7 +8366,7 @@ msgstr "Ryhmätyöohjelmisto"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-sähköposti ja -kalenteri"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
 msgid "Manage your email, contacts and schedule"
 msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
 
@@ -8050,6 +8376,25 @@ msgstr ""
 "email;calendar;contact;addressbook;task;sähköposti;kalenteri;yhteystiedot;"
 "osoitekirja;tehtävä;"
 
+#: ../data/evolution.desktop.in.in.h:6
+#| msgid "New _Window"
+msgid "New Window"
+msgstr "Uusi ikkuna"
+
+#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../data/evolution.desktop.in.in.h:10 ../e-util/e-send-options.c:538
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1242
+#: ../smime/gui/certificate-manager.c:1671
+msgid "Mail"
+msgstr "Sähköposti"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Käytä osoitteen muotoilua"
@@ -8349,10 +8694,9 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuutti, jona työpäivä alkaa, väliltä 0-59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Monday"
-msgstr "Työpäivän alkamistunti"
+msgstr "Työpäivän alkamisaika maanantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
 #, fuzzy
@@ -8363,10 +8707,9 @@ msgid ""
 msgstr "Tunti jona työpäivä alkaa 24-tunnin muodossa, väliltä 0-23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Monday"
-msgstr "Työpäivän päättymistunti"
+msgstr "Työpäivän päättymisaika maanantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
 #, fuzzy
@@ -8376,10 +8719,9 @@ msgid ""
 msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-#, fuzzy
 #| msgid "Workday start minute"
 msgid "Workday start time for Tuesday"
-msgstr "Työpäivän alkamisminuutti"
+msgstr "Työpäivän alkamisaika tiistaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
 #, fuzzy
@@ -8389,70 +8731,59 @@ msgid ""
 msgstr "Tunti jona työpäivä päättyy 24-tunnin muodossa, väliltä 0-23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#, fuzzy
 #| msgid "Workday end minute"
 msgid "Workday end time for Tuesday"
-msgstr "Työpäivän päättymisminuutti"
+msgstr "Työpäivän päättymisaika tiistaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-#, fuzzy
 #| msgid "Workday start minute"
 msgid "Workday start time for Wednesday"
-msgstr "Työpäivän alkamisminuutti"
+msgstr "Työpäivän alkamisaika keskiviikolle"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#, fuzzy
 #| msgid "Workday end minute"
 msgid "Workday end time for Wednesday"
-msgstr "Työpäivän päättymisminuutti"
+msgstr "Työpäivän päättymisaika keskiviikolle"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Thursday"
-msgstr "Työpäivän alkamistunti"
+msgstr "Työpäivän alkamisaika torstaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Thursday"
-msgstr "Työpäivän päättymistunti"
+msgstr "Työpäivän päättymisaika torstaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Friday"
-msgstr "Työpäivän alkamistunti"
+msgstr "Työpäivän alkamisaika perjantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Friday"
-msgstr "Työpäivän päättymistunti"
+msgstr "Työpäivän päättymisaika perjantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Saturday"
-msgstr "Työpäivän alkamistunti"
+msgstr "Työpäivän alkamisaika lauantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Saturday"
-msgstr "Työpäivän päättymistunti"
+msgstr "Työpäivän päättymisaika lauantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Sunday"
-msgstr "Työpäivän alkamistunti"
+msgstr "Työpäivän alkamisaika sunnuntaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Sunday"
-msgstr "Työpäivän päättymistunti"
+msgstr "Työpäivän päättymisaika sunnuntaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
@@ -8804,127 +9135,138 @@ msgid "Whether to display the end time of events in the week and month views"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#, fuzzy
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment icons in the month view"
+msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#, fuzzy
+msgid "Whether to show icons of events in the month view"
+msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #, fuzzy
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #, fuzzy
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #, fuzzy
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 #, fuzzy
 msgid "Vertical position for the tag pane"
 msgstr "Pystysijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "Korosta tänään erääntyvät tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 #, fuzzy
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
 msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "Tehtävien asettelutapa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #, fuzzy
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Show reminders for completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether to show reminders for completed tasks. When set to false, reminders "
 "for completed tasks are suppressed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
 msgstr "Korosta eräpäivän ylittäneet tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 #, fuzzy
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
 msgstr "Eräpäivän ylittäneiden tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Päivä- ja viikkonäkymissä näytettävät aikavälit minuutteina."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
@@ -8934,91 +9276,94 @@ msgstr ""
 "kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/"
 "Helsinki\"."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "24 tunnin kello"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 #, fuzzy
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 #, fuzzy
 msgid "Birthday and anniversary reminder"
 msgstr "Syntymä- ja vuosipäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 #, fuzzy
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
 msgstr "Tapaamisen oletusmuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 #, fuzzy
 msgid "Whether to set a default reminder for appointments"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "Käytä järjestelmän aikavyöhykettä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
-#, fuzzy
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta."
+msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "First day of the week"
 msgstr "Viikon ensimmäinen päivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "Maanantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "Tiistai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "Keskiviikko on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "Torstai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "Perjantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "Lauantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "Sunnuntai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Create events, memos and tasks as Private by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 #, fuzzy
 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:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 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:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(Vanhennettu) Työpäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 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-"
@@ -9095,7 +9440,9 @@ msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
+#, fuzzy
+#| msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
@@ -9388,10 +9735,9 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#, fuzzy
 #| msgid "Enable express mode"
 msgid "Enable developer mode"
-msgstr "Ota pikatila käyttöön"
+msgstr "Ota kehittäjätila käyttöön"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
@@ -9428,18 +9774,26 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-msgid "Save file format for drag-and-drop operation"
+msgid "Wrap quoted text in replies"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid "If set to 'true' quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Voi olla joko 'mbox' tai 'pdf'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9447,11 +9801,11 @@ 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:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9459,11 +9813,11 @@ msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä "
 "interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 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:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9471,164 +9825,186 @@ 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:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 #, 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:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 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:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Show notification about missing remote content"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 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:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "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 ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:92
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 #| msgid "Show photo of the sender"
 msgid "Search gravatar.com for photo of the sender"
-msgstr "Näytä lähettäjän valokuva"
+msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 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:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 #, fuzzy
 #| msgid "Mark as Seen after specified timeout"
 msgid "Mark as Seen always after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 #, 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:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#, fuzzy
+#| msgid "Show deleted messages in the message-list"
+msgid "Show junk messages in the message-list"
+msgstr "Näytä poistetut viestit viestiluettelossa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#, fuzzy
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 #, 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:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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."
@@ -9637,31 +10013,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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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 "
@@ -9669,35 +10045,35 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen fontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Terminal font"
 msgstr "Päätteen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "The terminal font for mail display."
 msgstr "Päätefontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Use custom fonts"
 msgstr "Käytä omia fontteja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia fontteja näytettäessä viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 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:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9705,11 +10081,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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9717,11 +10093,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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9729,11 +10105,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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9741,11 +10117,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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 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:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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 "
@@ -9755,11 +10131,11 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on "
@@ -9773,11 +10149,11 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9785,46 +10161,46 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 #, fuzzy
 #| msgid ""
 #| "Prompt the user when he or she tries to send a message without a Subject."
@@ -9834,34 +10210,34 @@ msgid ""
 msgstr ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Kysy vahvistus käyttäjältä, kun roskakoria ollaan tyhjentämässä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
@@ -9869,7 +10245,7 @@ msgstr ""
 "sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
@@ -9878,21 +10254,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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9900,11 +10276,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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9912,19 +10288,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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 "
@@ -9933,11 +10309,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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -9945,11 +10321,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -9957,12 +10333,12 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 #, 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:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -9971,25 +10347,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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 #, 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 #, 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -9998,13 +10374,13 @@ 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
@@ -10013,59 +10389,59 @@ 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 #, fuzzy
 msgid "Prompt when sending to many To and CC recipients"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 #, 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10073,22 +10449,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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Show original \"Date\" header value."
 msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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."
@@ -10096,47 +10472,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:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 #, 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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -10146,11 +10522,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:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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 "
@@ -10163,7 +10539,7 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
 "osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10171,7 +10547,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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -10181,12 +10557,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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -10196,11 +10572,11 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10208,52 +10584,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
 "kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Check for new messages in all active accounts"
 msgstr "Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10261,13 +10637,13 @@ 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Allow expunge in virtual folders"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -10275,82 +10651,82 @@ msgid ""
 "for deleted messages belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 #, 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:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 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:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 #, 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:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 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:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 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:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10562,10 +10938,9 @@ msgstr ""
 "Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#, fuzzy
 #| msgid "Beep or play sound file."
 msgid "Whether to play a sound file."
-msgstr "Piippaa tai soita äänitiedosto."
+msgstr "Toistetaanko äänitiedosto."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
 msgid ""
@@ -10591,7 +10966,8 @@ msgstr "Käytä omia fontteja näytettäessä viestejä."
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"prefer_source\" makes it use the text part, if present, otherwise shows "
+"HTML source, and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
@@ -10649,7 +11025,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:324
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -10679,18 +11055,28 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "Ottaa käyttöön paljon yksinkertaistetun käyttöliittymän."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+msgid "List of button names to hide in the window switcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+"Change of this requires restart of the application."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Whether the window buttons should be visible."
 msgstr "Näytetäänkö ikkunan napit."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10700,39 +11086,39 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
 "asetusta."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "Työkalupalkki on näkyvissä"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on näkyvissä"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "Näytetäänkö sivupaneeli."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "Tilarivi on näkyvissä"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Näytetäänkö tilarivi."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "Sivupaneelin oletusleveys"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinä."
 
@@ -10766,15 +11152,6 @@ msgid ""
 "arguments."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Liite"
-msgstr[1] "Liitteet"
-
 #: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "Näytä liitteenä"
@@ -10822,15 +11199,15 @@ msgstr "RFC822-viesti"
 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:51
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Nimi"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
@@ -10846,7 +11223,7 @@ msgstr "Aihe"
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1484
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "Postittaja"
 
@@ -11005,14 +11382,18 @@ msgstr "_Näytä varmenne"
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "Lähde"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr ""
 
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
+msgid "To"
+msgstr "Vastaanottaja"
+
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
@@ -11025,28 +11406,26 @@ msgstr "Kopiot"
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: ../em-format/e-mail-formatter-utils.c:564
+#: ../em-format/e-mail-formatter-utils.c:566
 msgid "GPG signed"
 msgstr "GPG-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-utils.c:570
-#| msgid "GPG encrpyted"
+#: ../em-format/e-mail-formatter-utils.c:572
 msgid "GPG encrypted"
 msgstr "GPG-salattu"
 
-#: ../em-format/e-mail-formatter-utils.c:576
+#: ../em-format/e-mail-formatter-utils.c:578
 msgid "S/MIME signed"
 msgstr "S/MIME-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-utils.c:582
-#| msgid "S/MIME encrpyted"
+#: ../em-format/e-mail-formatter-utils.c:584
 msgid "S/MIME encrypted"
 msgstr "S/MIME-salattu"
 
-#: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:748
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+#: ../em-format/e-mail-formatter-utils.c:593
+#: ../mail/e-mail-config-security-page.c:760
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
 msgid "Security"
 msgstr "Turvallisuus"
 
@@ -11211,72 +11590,53 @@ msgstr "Sulje tämä viesti (Escape)"
 msgid "Failed to create a thread: "
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
-msgid "Icon View"
-msgstr "Kuvakenäkymä"
-
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
-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.
-#: ../e-util/e-attachment.c:1223
+#: ../e-util/e-attachment.c:1227
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
-#, fuzzy
+#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
 #| msgid "Import cancelled."
 msgid "Operation was cancelled"
-msgstr "Tuonti peruttiin."
+msgstr "Toiminto peruttiin"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
-#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
+#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2521
-#, c-format
-msgid "Could not load '%s'"
-msgstr "%s ei voitu ladata"
-
-#: ../e-util/e-attachment.c:2524
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Liitettä ei voitu avata"
-
-#: ../e-util/e-attachment.c:2809
+#: ../e-util/e-attachment.c:2830
 #, c-format
 msgid "Could not open '%s'"
 msgstr "%s ei voitu avata"
 
-#: ../e-util/e-attachment.c:2812
+#: ../e-util/e-attachment.c:2833
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../e-util/e-attachment.c:3459
+#: ../e-util/e-attachment.c:3480
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../e-util/e-attachment.c:3550
+#: ../e-util/e-attachment.c:3571
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
 
-#: ../e-util/e-attachment.c:3553
+#: ../e-util/e-attachment.c:3574
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
@@ -11289,11 +11649,17 @@ msgstr "Liitteen ominaisuudet"
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
+#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:422
+msgid "_Description:"
+msgstr "K_uvaus:"
+
 #: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
@@ -11306,12 +11672,12 @@ msgid "Set as _Background"
 msgstr "Aseta _taustakuvaksi"
 
 #: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../e-util/e-attachment-tree-view.c:554
 msgid "Loading"
 msgstr "Ladataan"
 
 #: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../e-util/e-attachment-tree-view.c:566
 msgid "Saving"
 msgstr "Tallennetaan"
 
@@ -11323,35 +11689,34 @@ msgstr "Piilota _liitepalkki"
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../e-util/e-attachment-store.c:486
+#: ../e-util/e-attachment-store.c:491
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../e-util/e-attachment-store.c:533
+#: ../e-util/e-attachment-store.c:538
 msgid "Archive selected directories using this format:"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:626
+#: ../e-util/e-attachment-store.c:631
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
-#: ../e-util/e-attachment-store.c:653
-#, fuzzy
+#: ../e-util/e-attachment-store.c:658
 #| msgid "Could not load the attachment"
 msgid "Do _not extract files from the attachment"
-msgstr "Liitettä ei voitu avata"
+msgstr "_Älä pura tiedostoja liitteestä"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:663
 msgid "Save extracted files _only"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:668
 msgid "Save extracted files and the original _archive"
 msgstr ""
 
@@ -11379,16 +11744,16 @@ msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
 #: ../e-util/e-attachment-view.c:468
-#: ../modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../modules/calendar/e-cal-shell-view-actions.c:1240
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 #: ../modules/mail/e-mail-shell-view-actions.c:1645
 #: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../e-util/e-attachment-view.c:485
+#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
 msgid "_Hide"
 msgstr "_Piilota"
 
@@ -11455,40 +11820,40 @@ msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-napsauta avataksesi linkin"
 
-#: ../e-util/e-calendar.c:195
+#: ../e-util/e-calendar.c:207
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: ../e-util/e-calendar.c:220
+#: ../e-util/e-calendar.c:232
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: ../e-util/e-calendar.c:246
+#: ../e-util/e-calendar.c:258
 msgid "Previous year"
 msgstr "Edellinen vuosi"
 
-#: ../e-util/e-calendar.c:271
+#: ../e-util/e-calendar.c:283
 msgid "Next year"
 msgstr "Seuraava vuosi"
 
-#: ../e-util/e-calendar.c:295
+#: ../e-util/e-calendar.c:307
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
+#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1324
+#: ../e-util/e-calendar-item.c:1339
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1361
+#: ../e-util/e-calendar-item.c:1376
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -11536,19 +11901,16 @@ msgid "_Available Categories:"
 msgstr "_Käytettävissä olevat luokat:"
 
 #: ../e-util/e-categories-editor.c:274
-#| msgid "_New"
 msgctxt "category"
 msgid "_New"
 msgstr "_Uusi"
 
 #: ../e-util/e-categories-editor.c:278
-#| msgid "_Edit"
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #: ../e-util/e-categories-editor.c:282
-#| msgid "_Delete"
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Poista"
@@ -11594,7 +11956,7 @@ msgid "popup list"
 msgstr "ponnahduslista"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2033
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
 msgid "?"
 msgstr "?"
 
@@ -11604,7 +11966,7 @@ msgstr "Nyt"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 #: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "Tänään"
@@ -11724,13 +12086,12 @@ msgid "Cannot create a client object from extension name '%s'"
 msgstr ""
 
 #: ../e-util/e-color-chooser-widget.c:124
-#| msgid "Use custom fonts"
 msgid "Choose custom color"
 msgstr "Käytä omavalintainen väri"
 
 #: ../e-util/e-color-combo.c:81
 msgid "black"
-msgstr ""
+msgstr "musta"
 
 #: ../e-util/e-color-combo.c:82
 msgid "light brown"
@@ -11784,7 +12145,7 @@ msgstr ""
 
 #: ../e-util/e-color-combo.c:95
 msgid "blue"
-msgstr ""
+msgstr "sininen"
 
 #: ../e-util/e-color-combo.c:96
 msgid "dull purple"
@@ -11795,14 +12156,13 @@ msgid "dark grey"
 msgstr ""
 
 #: ../e-util/e-color-combo.c:99
-#, fuzzy
 #| msgid "3rd"
 msgid "red"
-msgstr "3."
+msgstr "punainen"
 
 #: ../e-util/e-color-combo.c:100
 msgid "orange"
-msgstr ""
+msgstr "oranssi"
 
 #: ../e-util/e-color-combo.c:101
 msgid "lime"
@@ -11826,7 +12186,7 @@ msgstr ""
 
 #: ../e-util/e-color-combo.c:106
 msgid "gray"
-msgstr ""
+msgstr "harmaa"
 
 #: ../e-util/e-color-combo.c:108
 #, fuzzy
@@ -11840,11 +12200,11 @@ msgstr ""
 
 #: ../e-util/e-color-combo.c:110
 msgid "yellow"
-msgstr ""
+msgstr "keltainen"
 
 #: ../e-util/e-color-combo.c:111
 msgid "green"
-msgstr ""
+msgstr "vihreä"
 
 #: ../e-util/e-color-combo.c:112
 msgid "cyan"
@@ -11894,12 +12254,12 @@ msgstr ""
 
 #: ../e-util/e-color-combo.c:124
 msgid "white"
-msgstr ""
+msgstr "valkoinen"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3899
-#: ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "Oletukset"
 
@@ -12305,8 +12665,8 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "Määrittelemätön"
 
@@ -12361,7 +12721,6 @@ msgid "Insert HTML File"
 msgstr "Syötä HTML-tiedosto"
 
 #: ../e-util/e-html-editor-actions.c:597
-#| msgid "HTML _Mode"
 msgid "HTML file"
 msgstr "HTML-tiedosto"
 
@@ -12379,35 +12738,30 @@ msgid "Insert text file"
 msgstr "Kasvata tekstin kokoa"
 
 #: ../e-util/e-html-editor-actions.c:692
-#| msgid "Select a file"
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
 #: ../e-util/e-html-editor-actions.c:1078
-#, fuzzy
 #| msgid "Copy selected events to the clipboard"
 msgid "Copy selected text to the clipboard"
-msgstr "Kopioi valitut tapahtumat leikepöydälle"
+msgstr "Kopioi valittu teksti leikepöydälle"
 
 #: ../e-util/e-html-editor-actions.c:1085
-#, fuzzy
 #| msgid "Cut selected events to the clipboard"
 msgid "Cut selected text to the clipboard"
-msgstr "Leikkaa valitut tapahtumat leikepöydälle"
+msgstr "Leikkaa valittu teksti leikepöydälle"
 
 #. Widgets are treating Ctrl + v shortcut themselves
 #: ../e-util/e-html-editor-actions.c:1092
-#, fuzzy
 #| msgid "Paste events from the clipboard"
 msgid "Paste text from the clipboard"
-msgstr "Liitä tapahtumat leikepöydältä"
+msgstr "Liitä teksti leikepöydältä"
 
 #: ../e-util/e-html-editor-actions.c:1099
 msgid "Redo the last undone action"
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1113
-#| msgid "Copy the selection"
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
@@ -12429,10 +12783,9 @@ msgid "_Alignment"
 msgstr "_Tasaus"
 
 #: ../e-util/e-html-editor-actions.c:1162
-#, fuzzy
 #| msgid "_Languages"
 msgid "Current _Languages"
-msgstr "_Kielet"
+msgstr "_Nykyiset kielet"
 
 #: ../e-util/e-html-editor-actions.c:1179
 msgid "_Increase Indent"
@@ -12455,15 +12808,10 @@ msgid "Paste _Quotation"
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1207
-#| msgid "_Find"
 msgid "_Find..."
 msgstr "_Etsi..."
 
 #: ../e-util/e-html-editor-actions.c:1209
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Search for the Contact."
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
@@ -12472,15 +12820,13 @@ msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
 #: ../e-util/e-html-editor-actions.c:1221
-#| msgid "_Replace"
 msgid "Re_place..."
 msgstr "_Korvaa..."
 
 #: ../e-util/e-html-editor-actions.c:1223
-#, fuzzy
 #| msgid "Search for text in the displayed contact"
 msgid "Search for and replace text"
-msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
+msgstr "Etsi ja korvaa tekstiä"
 
 #: ../e-util/e-html-editor-actions.c:1228
 #, fuzzy
@@ -12568,32 +12914,26 @@ msgid "_Normal"
 msgstr "Tavallinen"
 
 #: ../e-util/e-html-editor-actions.c:1307
-#| msgid "Header"
 msgid "Header _1"
 msgstr "Otsake _1"
 
 #: ../e-util/e-html-editor-actions.c:1314
-#| msgid "Header"
 msgid "Header _2"
 msgstr "Otsake _2"
 
 #: ../e-util/e-html-editor-actions.c:1321
-#| msgid "Header"
 msgid "Header _3"
 msgstr "Otsake _3"
 
 #: ../e-util/e-html-editor-actions.c:1328
-#| msgid "Header"
 msgid "Header _4"
 msgstr "Otsake _4"
 
 #: ../e-util/e-html-editor-actions.c:1335
-#| msgid "Header"
 msgid "Header _5"
 msgstr "Otsake _5"
 
 #: ../e-util/e-html-editor-actions.c:1342
-#| msgid "Header"
 msgid "Header _6"
 msgstr "Otsake _6"
 
@@ -12602,7 +12942,6 @@ msgid "_Preformatted"
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1356
-#| msgid "Address"
 msgid "A_ddress"
 msgstr "_Osoite"
 
@@ -12630,7 +12969,6 @@ msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1407
 #: ../e-util/e-html-editor-actions.c:1445
-#| msgid "Save _Image..."
 msgid "_Image..."
 msgstr "_Kuva..."
 
@@ -12695,10 +13033,9 @@ msgid "Font _Size"
 msgstr "Fontin _koko"
 
 #: ../e-util/e-html-editor-actions.c:1490
-#, fuzzy
 #| msgid "_Forward style:"
 msgid "_Font Style"
-msgstr "_Välitystyyli:"
+msgstr "_Fontin tyyli"
 
 #: ../e-util/e-html-editor-actions.c:1497
 msgid "Paste As _Text"
@@ -12829,10 +13166,9 @@ msgid "Table Insert"
 msgstr "Taulukon solu"
 
 #: ../e-util/e-html-editor-actions.c:1672
-#, fuzzy
 #| msgid "_Properties"
 msgid "Properties"
-msgstr "_Ominaisuudet"
+msgstr "Ominaisuudet"
 
 #: ../e-util/e-html-editor-actions.c:1690
 msgid "Column After"
@@ -12861,7 +13197,6 @@ msgid "Cell..."
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1739
-#| msgid "Image"
 msgid "Image..."
 msgstr "Kuva..."
 
@@ -12870,10 +13205,9 @@ msgid "Link..."
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1753
-#, fuzzy
 #| msgid "Pager"
 msgid "Page..."
-msgstr "Hakulaite"
+msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1760
 msgid "Paragraph..."
@@ -12891,21 +13225,18 @@ msgid "Table..."
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1782
-#, fuzzy
 #| msgid "Select..."
 msgid "Text..."
-msgstr "Valitse..."
+msgstr "Text..."
 
 #: ../e-util/e-html-editor-actions.c:1789
-#| msgid "_Remove"
 msgid "Remove Link"
 msgstr "Poista linkki"
 
 #: ../e-util/e-html-editor-actions.c:1806
-#, fuzzy
 #| msgid "Add \"%s\" to Dictionary"
 msgid "Add Word to Dictionary"
-msgstr "Lisää \"%s\" sanastoon"
+msgstr "Lisää sana sanastoon"
 
 #: ../e-util/e-html-editor-actions.c:1813
 #, fuzzy
@@ -12918,52 +13249,49 @@ msgid "Add Word To"
 msgstr ""
 
 #: ../e-util/e-html-editor-actions.c:1829
-#, fuzzy
 #| msgid "(no suggestions)"
 msgid "More Suggestions"
-msgstr "(ei ehdotuksia)"
+msgstr "Lisää ehdotuksia"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1937
+#: ../e-util/e-html-editor-actions.c:1950
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
-#: ../e-util/e-html-editor-actions.c:2024
+#: ../e-util/e-html-editor-actions.c:2040
 msgid "_Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:2025
+#: ../e-util/e-html-editor-actions.c:2041
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Insert Emoticon"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../e-util/e-html-editor-actions.c:2093
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "Re_place"
 msgstr "_Korvaa"
 
-#: ../e-util/e-html-editor-actions.c:2096
-#| msgid "Image"
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Image"
 msgstr "_Kuva"
 
-#: ../e-util/e-html-editor-actions.c:2099
+#: ../e-util/e-html-editor-actions.c:2115
 msgid "_Link"
 msgstr ""
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2103
+#: ../e-util/e-html-editor-actions.c:2119
 #, fuzzy
 #| msgid "Add Rule"
 msgid "_Rule"
 msgstr "Lisää sääntö"
 
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2122
 #: ../e-util/e-html-editor-cell-dialog.c:738
 #, fuzzy
 #| msgid "E_nable"
@@ -12975,18 +13303,15 @@ msgid "Paragraph Style"
 msgstr ""
 
 #: ../e-util/e-html-editor.c:718
-#, fuzzy
 #| msgid "Edit Reminder"
 msgid "Editing Mode"
-msgstr "Muokkaa muistutusta"
+msgstr "Muokkaustila"
 
 #: ../e-util/e-html-editor.c:730
-#| msgid "Unset Color"
 msgid "Font Color"
 msgstr "Fontin väri"
 
 #: ../e-util/e-html-editor.c:748
-#| msgid "Size"
 msgid "Font Size"
 msgstr "Fontin koko"
 
@@ -13068,7 +13393,6 @@ msgstr "Raakateksti"
 
 #. Header Style
 #: ../e-util/e-html-editor-cell-dialog.c:816
-#| msgid "Header Value"
 msgid "_Header Style"
 msgstr "_Otsaketyyli"
 
@@ -13094,7 +13418,7 @@ msgstr ""
 #: ../e-util/e-html-editor-cell-dialog.c:901
 #: ../e-util/e-html-editor-table-dialog.c:916
 msgid "<b>Background</b>"
-msgstr ""
+msgstr "<b>Tausta</b>"
 
 #: ../e-util/e-html-editor-cell-dialog.c:914
 #: ../e-util/e-html-editor-table-dialog.c:929
@@ -13102,37 +13426,32 @@ msgid "Transparent"
 msgstr ""
 
 #: ../e-util/e-html-editor-cell-dialog.c:922
-#| msgid "Color:"
 msgid "C_olor:"
 msgstr "V_äri:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:930
 #: ../e-util/e-html-editor-image-dialog.c:527
 #: ../e-util/e-html-editor-table-dialog.c:945
-#| msgid "Could not set as background"
 msgid "Choose Background Image"
 msgstr "Valitse taustakuva"
 
 #: ../e-util/e-html-editor-cell-dialog.c:935
 #: ../e-util/e-html-editor-image-dialog.c:533
 #: ../e-util/e-html-editor-table-dialog.c:950
-#, fuzzy
 #| msgid "Image"
 msgid "Images"
-msgstr "Kuva"
+msgstr "Kuvat"
 
 #: ../e-util/e-html-editor-cell-dialog.c:948
-#| msgid "Image"
 msgid "_Image:"
 msgstr "_Kuva:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:955
 #: ../e-util/e-html-editor-page-dialog.c:660
 #: ../e-util/e-html-editor-table-dialog.c:970
-#, fuzzy
 #| msgid "_No image"
 msgid "_Remove image"
-msgstr "_Ei kuvaa"
+msgstr "_Poista kuva"
 
 #: ../e-util/e-html-editor-cell-dialog.c:975
 #, fuzzy
@@ -13148,10 +13467,9 @@ msgstr ""
 
 #: ../e-util/e-html-editor-find-dialog.c:160
 #: ../e-util/e-html-editor-replace-dialog.c:247
-#, fuzzy
 #| msgid "Search _Folders"
 msgid "Search _backwards"
-msgstr "_Hakunäkymät"
+msgstr "Etsi _taaksepäin"
 
 #: ../e-util/e-html-editor-find-dialog.c:167
 msgid "Case _Sensitive"
@@ -13164,7 +13482,6 @@ msgid "_Wrap Search"
 msgstr "Et_si"
 
 #: ../e-util/e-html-editor-find-dialog.c:213
-#| msgid "_Find"
 msgid "Find"
 msgstr "Etsi"
 
@@ -13180,7 +13497,6 @@ msgid "_Width:"
 msgstr "_Leveys:"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:393
-#| msgid "Size"
 msgid "_Size:"
 msgstr "_Koko:"
 
@@ -13209,12 +13525,10 @@ msgstr "Kansion ominaisuudet"
 #: ../e-util/e-html-editor-image-dialog.c:515
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:766
-#| msgid "General"
 msgid "<b>General</b>"
 msgstr "<b>Yleiset</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:544
-#| msgid "Source"
 msgid "_Source:"
 msgstr "_Lähde:"
 
@@ -13252,22 +13566,19 @@ msgid "_Test URL..."
 msgstr ""
 
 #: ../e-util/e-html-editor-image-dialog.c:730
-#, fuzzy
 #| msgid "Category Properties"
 msgid "Image Properties"
-msgstr "Luokan ominaisuudet"
+msgstr "Kuvan ominaisuudet"
 
 #: ../e-util/e-html-editor-link-dialog.c:429
-#, fuzzy
 #| msgid "_Remove"
 msgid "_Remove Link"
-msgstr "_Poista"
+msgstr "_Poista linkki"
 
 #: ../e-util/e-html-editor-link-dialog.c:454
-#, fuzzy
 #| msgid "_Properties"
 msgid "Link Properties"
-msgstr "_Ominaisuudet"
+msgstr "Linkin ominaisuudet"
 
 #: ../e-util/e-html-editor-page-dialog.c:72
 msgid "Perforated Paper"
@@ -13289,8 +13600,8 @@ msgstr ""
 msgid "Midnight"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
-#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Luonnos"
 
@@ -13303,10 +13614,9 @@ msgid "<b>Colors</b>"
 msgstr "<b>Värit</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:563
-#, fuzzy
 #| msgid "_Text Only"
 msgid "_Text:"
-msgstr "Vain _teksti"
+msgstr "_Teksti:"
 
 #: ../e-util/e-html-editor-page-dialog.c:578
 msgid "_Link:"
@@ -13317,17 +13627,16 @@ msgid "_Visited Link:"
 msgstr ""
 
 #: ../e-util/e-html-editor-page-dialog.c:608
-#, fuzzy
 #| msgid "Set as _Background"
 msgid "_Background:"
-msgstr "Aseta _taustakuvaksi"
+msgstr "_Tausta:"
 
 #: ../e-util/e-html-editor-page-dialog.c:616
 msgid "<b>Background Image</b>"
 msgstr "<b>Taustakuva</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:638
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 #, fuzzy
 #| msgid "Template:"
 msgid "_Template:"
@@ -13351,10 +13660,9 @@ msgid "Page Properties"
 msgstr "_Ominaisuudet"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:83
-#, fuzzy
 #| msgid "_Reply style:"
 msgid "_Style:"
-msgstr "_Vastaustyyli:"
+msgstr "_Tyyli:"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:90
 #, fuzzy
@@ -13369,18 +13677,17 @@ msgid "Paragraph Properties"
 msgstr "Luokan ominaisuudet"
 
 #: ../e-util/e-html-editor-replace-dialog.c:163
-#, fuzzy, c-format
+#, c-format
 #| msgid "occurrences"
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
-msgstr[0] "tapahtumiskertaa"
-msgstr[1] "tapahtumiskertaa"
+msgstr[0] "%d ilmentymä korvattu"
+msgstr[1] "%d ilmentymää korvattu"
 
 #: ../e-util/e-html-editor-replace-dialog.c:227
-#, fuzzy
 #| msgid "_Replace"
 msgid "R_eplace:"
-msgstr "_Korvaa"
+msgstr "_Korvaa:"
 
 #: ../e-util/e-html-editor-replace-dialog.c:239
 msgid "_With:"
@@ -13398,7 +13705,7 @@ msgstr "Et_si"
 
 #: ../e-util/e-html-editor-replace-dialog.c:265
 msgid "_Skip"
-msgstr ""
+msgstr "_Ohita"
 
 #: ../e-util/e-html-editor-replace-dialog.c:273
 #: ../e-util/e-system.error.xml.h:3
@@ -13406,16 +13713,14 @@ msgid "_Replace"
 msgstr "_Korvaa"
 
 #: ../e-util/e-html-editor-replace-dialog.c:281
-#| msgid "Reply to _All"
 msgid "Replace _All"
 msgstr "Ko_rvaa kaikki"
 
 #: ../e-util/e-html-editor-replace-dialog.c:301
-#, fuzzy
 #| msgid "_Replace"
 msgctxt "dialog-title"
 msgid "Replace"
-msgstr "_Korvaa"
+msgstr "Korvaa"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:88
 #, c-format
@@ -13428,26 +13733,24 @@ msgstr ""
 
 #. Replace
 #: ../e-util/e-html-editor-spell-check-dialog.c:555
-#| msgid "_Replace"
 msgid "Replace"
 msgstr "Korvaa"
 
 #. Replace All
 #: ../e-util/e-html-editor-spell-check-dialog.c:564
-#| msgid "_Replace"
 msgid "Replace All"
 msgstr "Korvaa kaikki"
 
 #. Ignore
 #: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Skip
 #: ../e-util/e-html-editor-spell-check-dialog.c:582
 msgid "Skip"
-msgstr ""
+msgstr "Ohita"
 
 #. Back
 #: ../e-util/e-html-editor-spell-check-dialog.c:591
@@ -13462,13 +13765,12 @@ msgstr ""
 
 #. Add Word button
 #: ../e-util/e-html-editor-spell-check-dialog.c:620
-#, fuzzy
 #| msgid "Add Folder"
 msgid "Add word"
-msgstr "Lisää kansio"
+msgstr "Lisää sana"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:637
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
@@ -13494,17 +13796,14 @@ msgstr "Ladataan"
 
 #: ../e-util/e-html-editor-table-dialog.c:937
 #: ../e-util/e-html-editor-text-dialog.c:261
-#| msgid "Color:"
 msgid "_Color:"
 msgstr "_Väri:"
 
 #: ../e-util/e-html-editor-table-dialog.c:963
-#| msgid "Image"
 msgid "Image:"
 msgstr "Kuva:"
 
 #: ../e-util/e-html-editor-table-dialog.c:990
-#| msgid "Calendar Properties"
 msgid "Table Properties"
 msgstr "Taulukon ominaisuudet"
 
@@ -13513,17 +13812,16 @@ msgid "Si_ze:"
 msgstr "_Koko:"
 
 #: ../e-util/e-html-editor-text-dialog.c:296
-#| msgid "_Properties"
 msgid "Text Properties"
 msgstr "Tekstin ominaisuudet"
 
-#: ../e-util/e-html-editor-view.c:5474
+#: ../e-util/e-html-editor-view.c:6381
 #, fuzzy
 #| msgid "Calendar Properties"
 msgid "Changed property"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../e-util/e-html-editor-view.c:5475
+#: ../e-util/e-html-editor-view.c:6382
 #, fuzzy
 #| msgid "Whether to show the preview pane."
 msgid "Whether editor changed"
@@ -13562,10 +13860,15 @@ msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
 #: ../e-util/e-import-assistant.c:533
+#, fuzzy
+#| 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."
 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."
+"Pine, Netscape, Elm, iCalendar, KMail. 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 "
@@ -13634,23 +13937,23 @@ msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../e-util/e-mail-signature-editor.c:297
+#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "Sulje"
 
-#: ../e-util/e-mail-signature-editor.c:302
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:533
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:566
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:602
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
@@ -13721,7 +14024,6 @@ msgstr "Avataan tehtävälistaa '%s'"
 
 #: ../e-util/e-misc-utils.c:2396
 #, c-format
-#| msgid "Opening calendar '%s'"
 msgid "Opening address book '%s'"
 msgstr "Avataan osoitekirja '%s'"
 
@@ -13748,10 +14050,10 @@ msgstr "Et_si:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1183
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -13768,12 +14070,6 @@ msgstr "Etsi"
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
 #: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
@@ -13843,7 +14139,7 @@ msgstr "_Muista salasana"
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: ../e-util/e-preferences-window.c:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
@@ -13997,14 +14293,6 @@ msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 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:329
-#: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1172
-#: ../smime/gui/certificate-manager.c:1671
-msgid "Mail"
-msgstr "Sähköposti"
-
 #: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
@@ -14039,6 +14327,10 @@ msgstr "Ei mitään"
 msgid "Mail Receipt"
 msgstr "Sähköpostin vastaanotto"
 
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "Lähetysasetukset"
+
 #: ../e-util/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
@@ -14152,26 +14444,56 @@ msgstr "Tyyppi:"
 msgid "Name:"
 msgstr "Nimi:"
 
+#: ../e-util/e-source-config.c:813
+#| msgid "One or more values cannot be empty."
+msgid "Name cannot be empty"
+msgstr "Nimi ei voi olla tyhjä"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1311
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä:"
 
-#: ../e-util/e-source-config.c:1437
+#: ../e-util/e-source-config.c:1439
 #, fuzzy
 #| msgid "Imported Certificate"
-msgid "Unset _trust for SSL certificate"
+msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../e-util/e-source-config.c:1473
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "Käyttäjä"
 
+#: ../e-util/e-source-selector.c:3214
+#| msgid "Show %s"
+msgid "Show"
+msgstr "Näytä"
+
+#: ../e-util/e-source-selector.c:3221
+#| msgid "Group Reply"
+msgid "Group name"
+msgstr "Ryhmän nimi"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#| msgid "Show %s"
+msgid "_Show"
+msgstr "_Näytä"
+
+#: ../e-util/e-source-selector.c:3428
+#| msgid "Manager"
+msgid "Manage Groups"
+msgstr "Hallitse ryhmiä"
+
+#: ../e-util/e-source-selector.c:3440
+#| msgid "_Available Categories:"
+msgid "Available Groups:"
+msgstr "Käytettävissä olevat ryhmät:"
+
 #: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Kohde"
@@ -14183,7 +14505,6 @@ msgstr "Valitse kohde"
 #. Translators: %s is the language ISO code.
 #: ../e-util/e-spell-dictionary.c:266
 #, c-format
-#| msgid "Unknown"
 msgctxt "language"
 msgid "Unknown (%s)"
 msgstr "Tuntematon (%s)"
@@ -14192,35 +14513,33 @@ msgstr "Tuntematon (%s)"
 #. * second is the country name. Example: "French (France)"
 #: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
 #, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u%s)"
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:457
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(ei ehdotuksia)"
 
-#: ../e-util/e-spell-entry.c:481
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "Lisää..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:566
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:615
+#: ../e-util/e-spell-entry.c:636
 #, fuzzy
 #| msgid "Ignore"
 msgid "Ignore All"
 msgstr "Älä välitä"
 
-#: ../e-util/e-spell-entry.c:647
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "Kirjoitusehdotukset"
 
@@ -14253,7 +14572,7 @@ msgstr "Tiedostoa \"{0}\" ei voi avata."
 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:64
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Ilmoitettu virhe oli &quot;{1}&quot;."
 
@@ -14613,97 +14932,97 @@ msgid "Flags"
 msgstr "_Merkki:"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:721
+#: ../mail/e-mail-config-identity-page.c:760
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../e-util/e-web-view.c:316
+#: ../e-util/e-web-view.c:318
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:320
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../e-util/e-web-view.c:326
+#: ../e-util/e-web-view.c:328
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:330
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view.c:336
+#: ../e-util/e-web-view.c:338
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../e-util/e-web-view.c:343
+#: ../e-util/e-web-view.c:345
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:347
 #, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../e-util/e-web-view.c:360
+#: ../e-util/e-web-view.c:362
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:364
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:367
+#: ../e-util/e-web-view.c:369
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:371
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
+#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1074
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../e-util/e-web-view.c:1071
+#: ../e-util/e-web-view.c:1076
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../e-util/e-web-view.c:1082
+#: ../e-util/e-web-view.c:1087
 #, fuzzy, c-format
 #| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../e-util/e-web-view.c:1084
+#: ../e-util/e-web-view.c:1089
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../e-util/e-web-view.c:1088
+#: ../e-util/e-web-view.c:1093
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../e-util/e-web-view.c:3039
+#: ../e-util/e-web-view.c:3127
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:3227
+#: ../e-util/e-web-view.c:3315
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../e-util/e-web-view.c:3263
+#: ../e-util/e-web-view.c:3351
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Tallennetaan kuva kohteeseen \"%s\""
@@ -14753,7 +15072,7 @@ msgstr "Virhe säännöllisessä lausekkeessa &quot;{0}&quot;."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Säännöllistä lauseketta &quot;{1}&quot; ei voi kääntää."
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -14785,6 +15104,16 @@ msgstr "Arvo puuttuu."
 msgid "One or more values cannot be empty."
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
+#: ../e-util/filter.error.xml.h:16
+#, fuzzy
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to remove rule '{0}'?"
+msgstr "Haluatko varmasti poistaa tehtävän \"{0}\"?"
+
+#: ../e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr ""
+
 #: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "tämänhetkinen aika"
@@ -14797,7 +15126,7 @@ msgstr "määrittelemäsi aika"
 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:89
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -14907,7 +15236,7 @@ msgstr "Luo uusi _näkymä"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
@@ -14915,7 +15244,7 @@ msgstr "Haluatko tallentaa muutokset?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
@@ -14943,7 +15272,7 @@ msgstr "Allekirjoitusta ei voi ladata."
 msgid "Could not save signature."
 msgstr "Allekirjoitusta ei voi tallentaa."
 
-#: ../evolution.appdata.xml.in.h:1
+#: ../evolution.appdata.xml.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
@@ -14951,7 +15280,7 @@ msgstr ""
 "Evolution on henkilökohtaisen tiedon hallintasovellus, joka tarjoaa "
 "sähköpostin, kalenterin ja osoitekirjan."
 
-#: ../evolution.appdata.xml.in.h:2
+#: ../evolution.appdata.xml.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -14963,6 +15292,17 @@ msgstr ""
 "noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft "
 "Exchange -palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
 
+#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+#| msgid "OAuth2"
+msgid "OAuth2 Google"
+msgstr "OAuth2 Google"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -15023,50 +15363,50 @@ msgid "Invalid folder URI '%s'"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
 #: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1049
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
 #: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../libemail-engine/e-mail-session.c:1261
+#: ../libemail-engine/e-mail-session.c:1262
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../libemail-engine/e-mail-session.c:1318
+#: ../libemail-engine/e-mail-session.c:1319
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been "
@@ -15076,13 +15416,13 @@ msgid ""
 "cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-session.c:1331
+#: ../libemail-engine/e-mail-session.c:1332
 #, 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.c:2360
+#: ../libemail-engine/e-mail-session.c:2362
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for '%s'"
@@ -15136,17 +15476,17 @@ msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../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:265
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
@@ -15309,7 +15649,7 @@ msgid "De_fault"
 msgstr "_Oletustili"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/mail/em-composer-prefs.c:1282
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -15327,12 +15667,12 @@ msgstr "Sähköpostiosoitetta ei annettu."
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
 #: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -15354,7 +15694,13 @@ msgstr "Evolutionin sähköpostitilien apulainen"
 msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
-#: ../mail/e-mail-config-auth-check.c:339
+#: ../mail/e-mail-config-auth-check.c:177
+#, fuzzy
+#| msgid "%s authentication failed"
+msgid "Querying authentication types..."
+msgstr "%s-tunnistautuminen epäonnistui"
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "Tarkista tuetut tyypit"
 
@@ -15376,102 +15722,145 @@ msgstr ""
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:371
+msgid "Checking server settings..."
+msgstr "Tarkistetaan palvelimen asetuksia..."
+
+#: ../mail/e-mail-config-defaults-page.c:489
+#, fuzzy
+#| msgid "Use locale default"
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "Käytä oletusaikavyöhykettä"
+
+#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Liite"
+
+#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Sisennetty (Outlookin tapaan)"
+
+#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Lainattu"
+
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Älä lainaa"
+
+#: ../mail/e-mail-config-defaults-page.c:822
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:831
 msgid "Draft Messages _Folder:"
 msgstr "Luonnosviestin _kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:841
 msgid "Choose a folder for saving draft messages."
 msgstr "Valitse tallennuskansio luonnosviesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:865
 msgid "Choose a folder for saving sent messages."
 msgstr "Valitse tallennuskansio lähetetyille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:884
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:628
+#: ../mail/e-mail-config-defaults-page.c:901
 #, fuzzy
 #| msgid "Search Folders"
 msgid "Archi_ve Folder:"
 msgstr "Hakunäkymät"
 
-#: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1397
+#: ../mail/e-mail-config-defaults-page.c:911
+#: ../modules/mail/em-mailer-prefs.c:1403
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder to archive messages to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:929
 msgid "_Restore Defaults"
 msgstr "_Palauta oletukset"
 
-#: ../mail/e-mail-config-defaults-page.c:666
+#: ../mail/e-mail-config-defaults-page.c:946
+#, fuzzy
+#| msgid "Go to Folder"
+msgid "_Lookup Folders"
+msgstr "Siirry kansioon"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:667
+#: ../mail/e-mail-config-defaults-page.c:965
 msgid "Choose a folder for deleted messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:676
+#: ../mail/e-mail-config-defaults-page.c:974
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:677
+#: ../mail/e-mail-config-defaults-page.c:975
 #, 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:694
+#: ../mail/e-mail-config-defaults-page.c:992
 msgid "Composing Messages"
 msgstr "Viestien kirjoittaminen"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:1001
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:728
+#: ../mail/e-mail-config-defaults-page.c:1026
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:763
+#: ../mail/e-mail-config-defaults-page.c:1057
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "Re_ply style:"
+msgstr "_Vastaustyyli:"
+
+#: ../mail/e-mail-config-defaults-page.c:1093
 msgid "Message Receipts"
 msgstr "Viestin kuittaukset"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:1102
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/e-mail-config-defaults-page.c:797
+#: ../mail/e-mail-config-defaults-page.c:1127
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/e-mail-config-defaults-page.c:803
+#: ../mail/e-mail-config-defaults-page.c:1133
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/e-mail-config-defaults-page.c:809
+#: ../mail/e-mail-config-defaults-page.c:1139
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/e-mail-config-defaults-page.c:880
+#: ../mail/e-mail-config-defaults-page.c:1246
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:286
 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 "
@@ -15481,13 +15870,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:310
-#: ../mail/e-mail-config-summary-page.c:322
+#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: ../mail/e-mail-config-identity-page.c:346
-#: ../mail/e-mail-config-summary-page.c:352
+#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-summary-page.c:353
 #, fuzzy
 #| msgid ""
 #| "Type the name by which you would like to refer to this account.\n"
@@ -15499,39 +15888,63 @@ msgstr ""
 "Anna nimi, jolla haluat kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtainen\""
 
-#: ../mail/e-mail-config-identity-page.c:363
+#: ../mail/e-mail-config-identity-page.c:369
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:378
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/e-mail-config-identity-page.c:399
+#: ../mail/e-mail-config-identity-page.c:407
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/e-mail-config-identity-page.c:446
+#: ../mail/e-mail-config-identity-page.c:456
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:455
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/e-mail-config-identity-page.c:482
+#: ../mail/e-mail-config-identity-page.c:494
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/e-mail-config-identity-page.c:537
+#: ../mail/e-mail-config-identity-page.c:549
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/e-mail-config-identity-page.c:555
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "_Etsi postipalvelimen tiedot pohjautuen sähköpostiosoitteeseen"
 
+#: ../mail/e-mail-config-identity-page.c:611
+#| msgid "One or more values cannot be empty."
+msgid "Full Name cannot be empty"
+msgstr "Koko nimi ei voi olla tyhjä"
+
+#: ../mail/e-mail-config-identity-page.c:618
+#| msgid "One or more values cannot be empty."
+msgid "Email Address cannot be empty"
+msgstr "Sähköpostiosoite ei voi olla tyhjä"
+
+#: ../mail/e-mail-config-identity-page.c:623
+msgid "Email Address is not a valid email"
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:635
+msgid "Reply To is not a valid email"
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-summary-page.c:632
+#| msgid "One or more values cannot be empty."
+msgid "Account Name cannot be empty"
+msgstr "Tilin nimi ei voi olla tyhjä"
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Etsitään tilin tietoja..."
@@ -15556,16 +15969,15 @@ msgstr "Vastaanotto"
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
 #: ../mail/e-mail-config-security-page.c:251
 #, c-format
-#| msgid "Task - %s"
 msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
 #: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:30
+#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:625
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../modules/calendar/e-calendar-preferences.c:620
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Yleiset"
@@ -15587,22 +15999,22 @@ msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -15624,42 +16036,46 @@ msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/e-mail-config-security-page.c:514
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Secure MIME (S/MIME)"
 msgstr "Suojattu MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:547
-#: ../mail/e-mail-config-security-page.c:653
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "Valitse"
 
-#: ../mail/e-mail-config-security-page.c:556
-#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:606
+#: ../mail/e-mail-config-security-page.c:618
 msgid "Always sign outgoing messages when using this account"
 msgstr "Allekirjoita aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:629
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:671
+#: ../mail/e-mail-config-security-page.c:683
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:691
+#: ../mail/e-mail-config-security-page.c:703
 #, fuzzy
 #| msgid "Always encrypt to _myself when sending encrypted messages"
 msgid "Always encrypt to myself when sending encrypted messages"
@@ -15673,65 +16089,64 @@ msgstr "Lähetys"
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:305
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../mail/e-mail-config-summary-page.c:306
 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:369
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../mail/e-mail-config-summary-page.c:378
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../mail/e-mail-config-summary-page.c:392
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../mail/e-mail-config-summary-page.c:406
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Vastaanotto"
 
-#: ../mail/e-mail-config-summary-page.c:418
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Lähetys"
 
-#: ../mail/e-mail-config-summary-page.c:430
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
-#: ../mail/e-mail-config-summary-page.c:451
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../mail/e-mail-config-summary-page.c:472
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../mail/e-mail-config-summary-page.c:493
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Salaus:"
 
-#: ../mail/e-mail-config-summary-page.c:784
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
 #: ../mail/e-mail-config-welcome-page.c:156
-#, fuzzy
 #| msgid ""
 #| "Welcome to the Evolution Mail Configuration Assistant.\n"
 #| "\n"
@@ -15754,27 +16169,27 @@ msgstr "Tervetuloa"
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:104
 msgid "_Add to Address Book..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:111
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:118
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/e-mail-display.c:124
+#: ../mail/e-mail-display.c:125
 msgid "Send _Reply To..."
 msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:127
 msgid "Send a reply message to this address"
 msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:134
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
@@ -15797,21 +16212,18 @@ msgstr "Kansion _nimi:"
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../mail/e-mail-free-form-exp.c:236
-#, fuzzy
 #| msgid "Answered"
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Vastattu"
 
 #: ../mail/e-mail-free-form-exp.c:237
-#, fuzzy
 #| msgid "Deleted"
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Poistettu"
 
 #: ../mail/e-mail-free-form-exp.c:238
-#, fuzzy
 #| msgid "Draft"
 msgctxt "ffe"
 msgid "Draft"
@@ -15832,7 +16244,6 @@ msgid "Seen"
 msgstr "Näkemättä"
 
 #: ../mail/e-mail-free-form-exp.c:241
-#, fuzzy
 #| msgid "Attachment"
 #| msgid_plural "Attachments"
 msgctxt "ffe"
@@ -15904,6 +16315,33 @@ msgstr ""
 msgid "Color"
 msgstr "Väri"
 
+#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#, fuzzy
+#| msgid "Messages"
+msgid "Message Note"
+msgstr "Viestit"
+
+#: ../mail/e-mail-notes.c:612
+#, fuzzy
+#| msgid "Copying messages into folder %s"
+msgid "Cannot find message in its folder summary"
+msgstr "Kopioidaan viestejä kansioon %s"
+
+#: ../mail/e-mail-notes.c:815
+msgid "Storing changes..."
+msgstr ""
+
+#: ../mail/e-mail-notes.c:940
+#, fuzzy
+#| msgid "_Edit Message"
+msgid "Edit Message Note"
+msgstr "_Muokkaa viestiä"
+
+#: ../mail/e-mail-notes.c:1058
+#| msgid "Retrieving message"
+msgid "Retrieving message..."
+msgstr "Noudetaan viestiä..."
+
 #: ../mail/e-mail-print-config-headers.c:165
 #, fuzzy
 #| msgid "Move selected messages to another folder"
@@ -15940,675 +16378,712 @@ msgstr "Otsakkeen nimi"
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/e-mail-printer.c:168
+#: ../mail/e-mail-printer.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:147
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:146
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:488
+#, fuzzy
+#| msgid "Delete junk messages on e_xit"
+msgid "Deleting message note..."
+msgstr "Poista roskapostit _suljettaessa"
+
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../mail/e-mail-reader.c:1661
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Noudetaan viestiä ”%s”"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1965
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1967
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1972
 msgid "_Archive..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1974
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1979
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1981
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1986
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1988
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1993
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2000
+#, fuzzy
+#| msgid "_Add Attachment..."
+msgid "_Add note..."
+msgstr "_Lisää liite..."
+
+#: ../mail/e-mail-reader.c:2002
+#, fuzzy
+#| msgid "Create a new memo from the selected message"
+msgid "Add a note for the selected message"
+msgstr "Luo uusi muistilappu valitusta viestistä"
+
+#: ../mail/e-mail-reader.c:2007
+#, fuzzy
+#| msgid "Delete Memo"
+msgid "Delete no_te"
+msgstr "Poista muistilappu"
+
+#: ../mail/e-mail-reader.c:2009
+#, fuzzy
+#| msgid "Create a new event from the selected message"
+msgid "Delete the note for the selected message"
+msgstr "Luo uusi tapahtuma valitusta viestistä"
+
+#: ../mail/e-mail-reader.c:2014
+msgid "_Edit note..."
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2016
+#, fuzzy
+#| msgid "Create a new memo from the selected message"
+msgid "Edit a note for the selected message"
+msgstr "Luo uusi muistilappu valitusta viestistä"
+
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2023
 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:1936
+#: ../mail/e-mail-reader.c:2028
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2030
 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:1943
+#: ../mail/e-mail-reader.c:2035
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2037
 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:1950
+#: ../mail/e-mail-reader.c:2042
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2044
 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:1957
+#: ../mail/e-mail-reader.c:2049
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:2051
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2056
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2058
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2063
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:2065
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:2070
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2072
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2077
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2079
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2084
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2091
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2098
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
 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:2013
+#: ../mail/e-mail-reader.c:2105
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2112
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2119
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2126
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2128
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
 msgid "_Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2135
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
 #, fuzzy
 #| msgid "Next _Thread"
 msgid "_Ignore Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2142
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2147
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2149
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2154
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2156
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2161
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2163
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2168
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2170
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2177
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2184
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2189
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2196
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2198
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2203
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2205
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2212
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2217
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2219
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2224
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2226
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2231
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2233
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2238
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2240
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2245
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2247
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2252
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2254
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2259
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2261
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2266
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2268
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2273
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2275
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2280
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2282
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2289
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2296
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2301
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2303
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2308
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2310
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2315
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2317
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2324
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2331
 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:2244
+#: ../mail/e-mail-reader.c:2336
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2338
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2343
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2345
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2352
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2364
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2366
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2371
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2373
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2378
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2380
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2295
+#: ../mail/e-mail-reader.c:2387
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2394
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2401
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../mail/e-mail-reader.c:2316
+#: ../mail/e-mail-reader.c:2408
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../mail/e-mail-reader.c:2323
+#: ../mail/e-mail-reader.c:2415
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:2330
+#: ../mail/e-mail-reader.c:2422
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:2337
+#: ../mail/e-mail-reader.c:2429
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2436
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2443
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2453
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2455
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2460
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2462
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2467
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2469
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2474
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2476
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2515
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2531
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2535
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2539
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2439
+#: ../mail/e-mail-reader.c:2543
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2555
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2559
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2603
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2605
 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:2507
+#: ../mail/e-mail-reader.c:2611
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2613
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:3047
+#: ../mail/e-mail-reader.c:3164
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../mail/e-mail-reader.c:4078
+#: ../mail/e-mail-reader.c:4216
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:4079
+#: ../mail/e-mail-reader.c:4217
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:4098
+#: ../mail/e-mail-reader.c:4236
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:4099
+#: ../mail/e-mail-reader.c:4237
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:4177
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../mail/e-mail-reader.c:4315
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:4181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../mail/e-mail-reader.c:4319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/e-mail-reader.c:5240
+#: ../mail/e-mail-reader.c:5406
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5242
+#: ../mail/e-mail-reader.c:5408
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5259
+#: ../mail/e-mail-reader.c:5425
 #, c-format
 msgid "Allow remote content from %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5316
-#, fuzzy
+#: ../mail/e-mail-reader.c:5442
+#| msgid "_Do not show this message again"
+msgid "Do not show this message again"
+msgstr "Älä näytä tätä viestiä uudestaan"
+
+#: ../mail/e-mail-reader.c:5490
 #| msgid "Header content"
 msgid "Load remote content"
-msgstr "Otsakkeen sisältö"
+msgstr "Lataa etäsisältö"
 
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
 
 #: ../mail/e-mail-reader-utils.c:572
-#, fuzzy, c-format
+#, c-format
 #| msgid "Removing folder '%s'"
 msgid "Refreshing folder '%s'"
-msgstr "Poistetaan kansiota ”%s”"
-
-#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:972 ../shell/e-shell.c:994
-#: ../smime/gui/certificate-manager.c:346
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
+msgstr "Päivitetään kansiota '%s'"
 
 #: ../mail/e-mail-reader-utils.c:1165
 #, fuzzy
@@ -16628,13 +17103,13 @@ msgstr ""
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1417
+#: ../mail/e-mail-reader-utils.c:1421
 msgid "Printing"
 msgstr "Tulostetaan"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1654
+#: ../mail/e-mail-reader-utils.c:1658
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16649,7 +17124,7 @@ msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
 "sen?"
 
-#: ../mail/e-mail-reader-utils.c:2485
+#: ../mail/e-mail-reader-utils.c:2489
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -16660,17 +17135,17 @@ 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:2506
+#: ../mail/e-mail-reader-utils.c:2510
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../mail/e-mail-reader-utils.c:2879
+#: ../mail/e-mail-reader-utils.c:2883
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
-#: ../mail/e-mail-request.c:204
+#: ../mail/e-mail-request.c:207
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
@@ -16688,11 +17163,49 @@ msgstr "%s-tunnistautuminen epäonnistui"
 msgid "No data source found for UID '%s'"
 msgstr ""
 
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:390
+#, fuzzy, c-format
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] ""
+"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
+"(Bcc)?"
+msgstr[1] ""
+"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
+"(Bcc)?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:396
+#, c-format
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+msgstr[1] ""
+
+#. This message is never removed from the camel operation, otherwise the GtkInfoBar
+#. hides itself and the user sees no feedback.
+#: ../mail/em-composer-utils.c:790
+msgid "Waiting for attachments to load..."
+msgstr ""
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1603
+#: ../mail/em-composer-utils.c:1686
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16700,24 +17213,24 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:1609
+#: ../mail/em-composer-utils.c:1692
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1614
+#: ../mail/em-composer-utils.c:1697
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-composer-utils.c:2827
+#: ../mail/em-composer-utils.c:2984
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3265
+#: ../mail/em-composer-utils.c:3471
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:3270
+#: ../mail/em-composer-utils.c:3476
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -16821,10 +17334,9 @@ msgid "Select folder to use for AutoArchive"
 msgstr "Valitse kansio, johon tuodaan"
 
 #: ../mail/em-folder-properties.c:547
-#, fuzzy
 #| msgid "Delete junk messages on e_xit"
 msgid "_Delete old messages"
-msgstr "Poista roskapostit _suljettaessa"
+msgstr "_Poista vanhat viestit"
 
 #: ../mail/em-folder-properties.c:606
 msgid "AutoArchive"
@@ -16839,7 +17351,6 @@ msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
 #: ../mail/em-folder-selector.c:398
-#| msgid "Create a new mail folder"
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
@@ -16867,12 +17378,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -16926,7 +17437,7 @@ msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16934,7 +17445,7 @@ msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17001,7 +17512,7 @@ msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
 #: ../mail/em-subscription-editor.c:1986
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Pysäytä"
 
@@ -17026,10 +17537,9 @@ msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
 #: ../mail/em-utils.c:1680
-#, fuzzy
 #| msgid "Delete junk messages on e_xit"
 msgid "Deleting old messages"
-msgstr "Poista roskapostit _suljettaessa"
+msgstr "Poistetaan vanhoja viestejä"
 
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
@@ -17199,166 +17709,180 @@ msgstr "Pistemäärä"
 msgid "Size (kB)"
 msgstr "Koko (kB)"
 
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+#, fuzzy
+#| msgid "is greater than"
+msgid "is greater than or equal to"
+msgstr "on suurempi kuin"
+
 #: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
+#, fuzzy
+#| msgid "is less than"
+msgid "is less than or equal to"
+msgstr "on vähemmän kuin"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "Tärkeä"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "Luettu"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 #, fuzzy
 #| msgid "% Completed"
 msgid "is Completed"
 msgstr "% valmiina"
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 #, fuzzy
 #| msgid "% Completed"
 msgid "is not Completed"
 msgstr "% valmiina"
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "Lähteen yhteystieto"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "Välitä putkessa ohjelmalle"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "palauttaa"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "ei palauta"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "palauttaa enemmän kuin"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "palauttaa vähemmän kuin"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr "Viestin sijainti"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "Kaikki käyvät"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "Aseta merkintä"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "Aseta väri"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "Poista värin asetus"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "Muuta pisteytystä"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "Piippaa"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "Soita ääni"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "Välitä"
 
@@ -17422,10 +17946,9 @@ msgstr[0] "Osoite"
 msgstr[1] "Osoite"
 
 #: ../mail/importers/kmail-importer.c:354
-#, fuzzy
 #| msgid "Evolution Elm importer"
 msgid "Evolution KMail importer"
-msgstr "Evolution Elm-tuoja"
+msgstr "Evolution KMail-tuoja"
 
 #: ../mail/importers/kmail-importer.c:355
 #, fuzzy
@@ -17434,7 +17957,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Tuodaan sähköpostit Elmistä."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -17553,17 +18076,18 @@ msgid "Automatically insert _emoticons"
 msgstr "Lisää _hymiöt kuvina automaattisesti"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Use Unicode characters for smile_ys"
-msgstr ""
+#, fuzzy
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Un_icode characters for emoticons"
+msgstr "Käytä Unicode-merkkejä hymiöitä varten."
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Pyydä aina vastaanoton _kuittausta"
 
 #: ../mail/mail-config.ui.h:13
-#, fuzzy
 msgid "Encode filenames in an _Outlook/GMail way"
-msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
+msgstr "Muotoile tiedostonimet Outlookin ja _GMailin tapaan."
 
 #: ../mail/mail-config.ui.h:14
 #, fuzzy
@@ -17615,47 +18139,31 @@ msgstr ""
 "allekirjoitettu (PGP tai S/MIME)"
 
 #: ../mail/mail-config.ui.h:25
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Liite"
-
-#: ../mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Sisennetty (Outlookin tapaan)"
-
-#: ../mail/mail-config.ui.h:27
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Lainattu"
-
-#: ../mail/mail-config.ui.h:28
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "Älä lainaa"
+msgid "_Wrap quoted text in replies"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Sisennettynä"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "A_llekirjoitukset"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "_Kielet"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -17663,11 +18171,11 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -17676,34 +18184,34 @@ msgstr ""
 "seuraavissa tilanteissa etenemistä:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 #, fuzzy
 #| msgid "Sending a message with only _Bcc recipients defined"
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 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:51
+#: ../mail/mail-config.ui.h:52
 #, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
@@ -17711,55 +18219,47 @@ msgstr ""
 "listalle"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Lähettäessä viestiä vastaanottajille, _joita ei ole kirjoitettu "
 "sähköpostiosoitteen muodossa"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 #, fuzzy
 #| msgid "Sending a message with an _empty subject line"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Confirmations"
 msgstr "Vahvistukset"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 #, fuzzy
 #| msgid "Search Folders"
 msgid "Use for Folders"
 msgstr "Hakunäkymät"
 
-#: ../mail/mail-config.ui.h:61
-msgid "A_dd"
-msgstr "_Lisää"
-
-#: ../mail/mail-config.ui.h:63
-msgid "Re_move"
-msgstr "_Poista"
-
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 #, fuzzy
 #| msgid "Sender or Recipients"
 msgid "Use for Recipients"
 msgstr "Lähettäjä tai vastaanottajat"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:67 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Tili"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -17767,232 +18267,233 @@ msgid ""
 "parts are compared separately."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "Send Account"
 msgstr "Lähetystili"
 
-#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "Käynnistys"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "T_arkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Check for new messa_ges in all active accounts"
 msgstr "_Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "Viestin näyttäminen"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _fontteja kuin muut ohjelmat"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "_Oletusfontti:"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen fontti"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen fontti"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "_Tasalevyinen fontti:"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "Merkitse vie_stit luetuiksi viiveellä"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
-#: ../mail/mail-config.ui.h:91
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "väri"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Apply the same _view settings to all folders"
 msgstr "Käytä samoja _näkymäasetuksia kaikille kansioille"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "Sähköpostien poistaminen"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "Tyhj_ennä roskakorikansiot"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Archive Mail"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "On This Computer A_rchive folder:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "N_äytä animoidut kuvat"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Loading Remote Content"
-msgstr ""
+msgstr "Ladataan etäsisältöä"
 
-#: ../mail/mail-config.ui.h:106
-#| msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:107
 msgid "_Never load remote content from the Internet"
 msgstr "_Älä koskaan lataa etäsisältöä verkosta"
 
-#: ../mail/mail-config.ui.h:107
-#| msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:108
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Lataa viestin etäsisältö vain yhteystietojen lähettämissä viesteissä"
 
-#: ../mail/mail-config.ui.h:108
-#| msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:109
 msgid "_Always load remote content from the Internet"
 msgstr "Lataa _aina etäsisältö verkosta"
 
-#: ../mail/mail-config.ui.h:109
-#| msgid "_Add"
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Notify about _missing remote content in the message preview"
+msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Add"
 msgstr "Lisää"
 
-#: ../mail/mail-config.ui.h:110
-#| msgid "_Remove"
+#: ../mail/mail-config.ui.h:112
 msgid "Remove"
 msgstr "Poista"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Allow for sites:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 #, fuzzy
 #| msgid "All local folders"
 msgid "Allow for senders:"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "Lähettäjän valokuva"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 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:117
+#: ../mail/mail-config.ui.h:119
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 #: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 #, fuzzy
 #| msgid "Delete junk messages on e_xit"
 msgid "_Delete junk messages"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:126
 #, fuzzy
 #| msgid "Junk Test"
 msgid "Junk Test Options"
 msgstr "Roskapostitesti"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 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:126
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../mail/mail-config.ui.h:129
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../mail/mail-config.ui.h:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -18159,28 +18660,11 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite."
 
-#: ../mail/mail.error.xml.h:16
-#, fuzzy
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
-msgid "Are you sure you want to send a message with {0} To and CC recipients?"
-msgstr ""
-"Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
-"(Bcc)?"
-
 #: ../mail/mail.error.xml.h:17
-msgid ""
-"You are trying to send a message to {0} recipients in To and CC fields. This "
-"would result in all recipients seeing the email addresses of each other. In "
-"some cases this behaviour is undesired, especially if they do not know each "
-"other or if privacy is a concern. Consider adding recipients to the BCC "
-"field instead."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Haluatko varmasti lähettää viestin, jossa on virheellinen osoite?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -18189,11 +18673,11 @@ msgstr ""
 "sähköpostiosoitteeksi:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Haluatko varmasti lähettää viestin, jossa on virheellisiä osoitteita?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -18202,11 +18686,11 @@ msgstr ""
 "sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Lähetetäänkö yksityinen vastaus?"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -18216,11 +18700,11 @@ msgstr ""
 "Sähköpostilista yrittää ohjata vastaustasi takaisin listalle. Haluatko "
 "jatkaa?"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Vastaa _yksityisesti"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -18230,11 +18714,11 @@ msgstr ""
 "vastaamassa yksityisesti lähettäjälle etkä sähköpostilistalle. Haluatko "
 "jatkaa?"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Lähetetäänkö vastaus kaikille vastaanottajille?"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -18242,12 +18726,12 @@ msgstr ""
 "Olet vastaamassa viestiin, joka lähetettiin useille vastaanottajille. "
 "Haluatko vastata kaikille heille?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Viestiä ei voi lähettää, koska et ole määritellyt vastaanottajia"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -18256,11 +18740,11 @@ msgstr ""
 "sähköpostiosoitteita napsauttamalla Vastaanottaja: -painiketta kentän "
 "vieressä."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -18268,50 +18752,50 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kansiosta \"%{0}\"?"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jos jatkat, et voi palauttaa näitä viestejä."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:40
 #: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -18322,55 +18806,55 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa komentoa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while performing operation."
 msgstr "Virhe suoritettaessa toimenpidettä."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Syötä salasana."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten määrittelyjä."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Hakemistoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Cannot save to file \"{0}\"."
 msgstr "Tiedostoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Tallennushakemisto ei voi luoda, syy: \"{1}\""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voi luoda."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitä ei voi ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18378,25 +18862,25 @@ msgstr ""
 "Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voi nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 #, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Kansion &quot;{0}&quot; päivittäminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voi siirtää tai nimetä uudestaan."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Poistetaanko todella kansio \"{0}\" ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -18404,20 +18888,20 @@ msgstr ""
 "Jos poistat kansion, menetetään kaikki sen sisältö ja alikansiot "
 "sisältöineen pysyvästi."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Really delete folder \"{0}\"?"
 msgstr "Haluatko varmasti poistaa kansion ”{0}”?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Jos poistat kansion, kaikki sen sisältö menetetään pysyvästi."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid "These messages are not copies."
 msgstr "Nämä viestit eivät ole kopioita."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:71
 #, fuzzy
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
@@ -18428,63 +18912,63 @@ msgstr ""
 "alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ei voi nimetä uudestaan nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:73
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kansio \"{1}\" on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Lähdekansiota ei voi avata. Virhe: {2}"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Kohdekansiota ei voi avata. Virhe: {2}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi kopioida nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi luoda."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot open folder. Error: {1}"
 msgstr "Kansiota ei voi avata. Virhe: {1}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Haluatko varmasti poistaa tämän tilin ja kaikki sen välimuistit?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18492,30 +18976,30 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
 "poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Haluatko varmasti poistaa tämän tilin käytöstä ja poistaa kaikki sen "
 "välimuistit?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Jos jatkat, kaikki välimuistitilit poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Do _Not Disable"
 msgstr "_Älä poista käytöstä"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "_Disable"
 msgstr "Älä _käytä"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Hakunäkymää \"{0}\" ei voi muokata, koska sitä ei ole olemassa."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18523,39 +19007,39 @@ msgstr ""
 "Kansio on ehkä lisätty järjestelmän puolesta.\n"
 "Siirry hakunäkymien muokkaukseen ja lisää se erikseen, jos tarpeen."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Hakunäkymää \"{0}\" ei voi lisätä."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Kansio \"{0}\" on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:97
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:98
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:100
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:102
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:103
 msgid "No folder selected."
 msgstr "Kansiota ei ole valittu."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18565,11 +19049,11 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:106
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota \"{0}\"."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18580,19 +19064,19 @@ msgstr ""
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:111
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid "Evolution's local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -18603,20 +19087,20 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:117
 msgid "_Exit Evolution"
 msgstr "_Poistu Evolutionista"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:118
 #, fuzzy
 msgid "_Migrate Now"
 msgstr "Siirto"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -18624,24 +19108,30 @@ msgstr ""
 "Lisenssitiedostoa \"{0}\" ei voi lukea asennusongelman takia. Et voi käyttää "
 "tätä lähdettä ennen kuin voit hyväksyä lisenssin."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:121
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:122
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "Tuettujen tunnistautumistapojen kysely palvelimelta epäonnistui."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:124
+#, fuzzy
+#| msgid "Failed to retrieve messages."
+msgid "Failed to get server setup."
+msgstr "Viestien nouto epäonnistui."
+
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetöntä käyttöä varten?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -18649,27 +19139,27 @@ msgstr ""
 "Haluatko synkronoida paikallisesti kansiot, jotka on merkitty yhteydettömään "
 "käyttöön?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "Ä_lä synkronoi"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "_Synkronoi"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "Haluatko merkitä kaikki viestit luetuiksi?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 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:132
+#: ../mail/mail.error.xml.h:131
 msgid "Also mark messages in subfolders?"
 msgstr "Merkitse viestit myös alikansioissa?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18677,80 +19167,76 @@ msgstr ""
 "Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
 "kaikissa sen alikansioissa?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:133
 msgid "In Current Folder and _Subfolders"
 msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:134
 msgid "In Current _Folder Only"
 msgstr "Vain nykyisessä _kansiossa"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:135
 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:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Yes, Always"
 msgstr "_Kyllä, aina"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_No, Never"
 msgstr "Ei, ei koskaan"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:138
 #, fuzzy
 #| msgid "Copying folder %s"
 msgid "Copy folder in folder tree."
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:139
 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:142
-#| msgid "Do _not Send"
+#: ../mail/mail.error.xml.h:141
 msgid "Do _not copy"
 msgstr "Älä ko_pioi"
 
-#: ../mail/mail.error.xml.h:143
-#| msgid "_Always"
+#: ../mail/mail.error.xml.h:142
 msgid "_Always copy"
 msgstr "_Kopioi aina"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:143
 #, fuzzy
 #| msgid "N_ever"
 msgid "N_ever copy"
 msgstr "E_i koskaan"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:144
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Move folder in folder tree."
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:145
 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:148
-#| msgid "Do _not Send"
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not move"
 msgstr "Ä_lä siirrä"
 
-#: ../mail/mail.error.xml.h:149
-#| msgid "_Always"
+#: ../mail/mail.error.xml.h:148
 msgid "_Always move"
 msgstr "_Siirrä aina"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:149
 #, fuzzy
 #| msgid "N_ever"
 msgid "N_ever move"
 msgstr "E_i koskaan"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -18758,75 +19244,75 @@ msgstr ""
 "Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:151
 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:153
+#: ../mail/mail.error.xml.h:152
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:153
 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:155
+#: ../mail/mail.error.xml.h:154
 msgid "\"Check Junk\" Failed"
 msgstr "”Etsi roskapostia” epäonnistui"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Junk\" Failed"
 msgstr "”Ilmoita roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Not Junk\" Failed"
 msgstr "”Ilmoita ei-roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:157
 msgid "Remove duplicate messages?"
 msgstr "Poistetaanko viestien kaksoiskappaleet?"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:158
 msgid "No duplicate messages found."
 msgstr "Kaksoiskappaleita ei löytynyt."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:160
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:161
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:162
 #, 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:164
+#: ../mail/mail.error.xml.h:163
 #, fuzzy
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:164
 msgid "Unable to retrieve message."
 msgstr "Viestin nouto ei onnistunut."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:165
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:166
 #, fuzzy
 #| msgid "Start in offline mode"
 msgid "Message is not available in offline mode."
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:167
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18835,40 +19321,40 @@ msgid ""
 "available in offline mode."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to open folder."
 msgstr "Kansion avaus epäonnistui."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to find duplicate messages."
 msgstr "VIestin kaksoiskappaleiden etsiminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to retrieve messages."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to mark messages as read."
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to remove attachments from messages."
 msgstr "Liitteiden poisto viesteistä epäonnistui."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:174
 #, fuzzy
 msgid "Failed to download messages for offline viewing."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to save messages to disk."
 msgstr "Viestien tallennus levylle epäonnistui."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:176
 msgid "Hidden file is attached."
 msgstr "Piilotiedosto on liitetty."
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:177
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18876,75 +19362,95 @@ 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:179
+#: ../mail/mail.error.xml.h:178
 msgid "Printing failed."
 msgstr "Tulostus epäonnistui."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:179
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Tulostimen vastaus: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:180
 #, fuzzy
 #| msgid "Could not open destination"
 msgid "Could not perform this operation on {0}."
 msgstr "Kohdetta ei voi avata"
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:181
 msgid "You must be working online to complete this operation."
 msgstr ""
 "Verkkoyhteyden tulee olla muodostettu, jotta tämä toimenpide on mahdollista "
 "suorittaa."
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:182
 msgid "Message from &quot;{0}&quot; account:"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:183
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:187
 msgid "Remote content download had been blocked for this message."
-msgstr ""
+msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
 
-#: ../mail/mail.error.xml.h:189
+#: ../mail/mail.error.xml.h:188
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
 msgstr ""
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:191
+#: ../mail/mail.error.xml.h:190
 #, fuzzy
 #| msgid " (Completed "
 msgid "{0}, Completed on {1}"
 msgstr " (Valmis "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:193
+#: ../mail/mail.error.xml.h:192
 msgid "{0} by {1}"
 msgstr ""
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:195
+#: ../mail/mail.error.xml.h:194
 msgid "Overdue: {0} by {1}"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:196
+#, fuzzy
+#| msgid "This signature has been changed, but has not been saved."
+msgid "This message note has been changed, but has not been saved."
+msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
+
+#. Translators: {0} is the name of the folder where the delete of the message note failed.
+#: ../mail/mail.error.xml.h:199
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to delete message note in folder '{0}'"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
+
+#. Translators: {0} is the name of the folder where the store of the message note failed.
+#: ../mail/mail.error.xml.h:201
+#, fuzzy
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Failed to store message note in folder '{0}'"
+msgstr "Tapaaminen löytyi kalenterista \"%s\""
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Perutaan..."
@@ -19000,87 +19506,87 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:294
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:295
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:293
+#: ../mail/message-list.c:296
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:297
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:298
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:299
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:309
+#: ../mail/message-list.c:312
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:313
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:314
+#: ../mail/message-list.c:317
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:318
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6034
+#: ../mail/message-list.c:464 ../mail/message-list.c:6168
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:2050
+#: ../mail/message-list.c:2069
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:2062
+#: ../mail/message-list.c:2081
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:2070
+#: ../mail/message-list.c:2089
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:2072
+#: ../mail/message-list.c:2091
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2957
+#: ../mail/message-list.c:2997
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../mail/message-list.c:3622 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3699 ../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:4978
+#: ../mail/message-list.c:5105
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-list.c:5971
+#: ../mail/message-list.c:6107
 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 "
@@ -19088,7 +19594,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:5979
+#: ../mail/message-list.c:6115
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -19122,41 +19628,45 @@ msgstr "Viestit"
 msgid "Subject - Trimmed"
 msgstr "Otsikko - rajattu"
 
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "UID"
+
 #: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "Mikä tahansa otsake"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
-#: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2136
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2159
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2152
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2150
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2173
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2143
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2166
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Body contains"
 msgstr "Runko sisältää"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2145
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -19164,7 +19674,7 @@ msgstr "Lauseke"
 
 #. 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:122
-#: ../modules/mail/em-mailer-prefs.c:1552
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
@@ -19205,7 +19715,7 @@ msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
 #: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -19215,7 +19725,7 @@ msgid "_Contact"
 msgstr "_Yhteystieto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
@@ -19225,7 +19735,7 @@ msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
@@ -19235,251 +19745,270 @@ msgid "Address _Book"
 msgstr "_Osoitekirja"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:520
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 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:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "_Poista osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#, fuzzy
+#| msgid "_Add to Address Book..."
+msgid "_Manage Address Book groups..."
+msgstr "_Lisää osoitekirjaan..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Manage task list groups order and visibility"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrä kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 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:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Refresh the selected address book"
 msgstr "Päivitä valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 #, fuzzy
 msgid "Address Book _Map"
 msgstr "Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Show map with all contacts from selected address book"
 msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 #: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "Nimeä valittu osoitekirja uudestaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "_Etsi yhteystiedosta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move selected contacts to another address book"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "_Avaa yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti henkilölle..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 #: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:836
+#| msgid "_Manager:"
+msgid "_Manage groups..."
+msgstr "_Hallitse ryhmiä..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "Osoitekirjakartta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "Näytä _kartat"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 #, fuzzy
 msgid "Show maps in contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
-#: ../modules/calendar/e-memo-shell-view-actions.c:699
-#: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:716
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:968
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-memo-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:2131
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "Tulosta kaikki näytettävät yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 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:1244
-#: ../modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
@@ -19761,67 +20290,84 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
+#: ../modules/book-config-google/evolution-book-config-google.c:92
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
+#: ../modules/cal-config-google/e-cal-config-google.c:177
+#: ../modules/cal-config-google/e-cal-config-gtasks.c:117
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+#| msgid "One or more values cannot be empty."
+msgid "User name cannot be empty"
+msgstr "Käyttäjätunnus ei voi olla tyhjä"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "Standardi LDAP_portti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
-msgid "LDAP over SSL (deprecated)"
-msgstr "LDAP SSL:n yli (vanhennettu)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+#| msgid "LDAP over SSL (deprecated)"
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "LDAP SSL/TLS:n yli (vanhennettu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
-msgid "Microsoft Global Catalog over SSL"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+msgid "Port number is not valid"
+msgstr "Portin numero ei ole kelvollinen"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "Menetelmä:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 #, fuzzy
 #| msgid ""
 #| "This is the method Evolution will use to authenticate you.  Note that "
@@ -19837,38 +20383,38 @@ msgstr ""
 "palvelimellesi."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 #, fuzzy
 #| msgid "_Find Possible Search Bases"
 msgid "Find Possible Search Bases"
 msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend "
@@ -19886,26 +20432,33 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "Raja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "yhteystietoa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "Selaa kunnes raja tulee vastaan"
 
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+#| msgid "One or more values cannot be empty."
+msgid "Server address cannot be empty"
+msgstr "Palvelimen osoite ei voi olla tyhjä"
+
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
@@ -19913,25 +20466,30 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
-#, 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)"
+msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr ""
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
-#: ../modules/cal-config-google/e-google-chooser-button.c:213
+#: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
-#: ../modules/cal-config-google/e-google-chooser-button.c:217
+#: ../modules/cal-config-google/e-google-chooser-button.c:228
 #, fuzzy
 #| msgid "New Memo List"
 msgid "Choose a Memo List"
 msgstr "Uusi muistilappulista"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
-#: ../modules/cal-config-google/e-google-chooser-button.c:221
+#: ../modules/cal-config-google/e-google-chooser-button.c:232
 #, fuzzy
 #| msgid "Select a Task List"
 msgid "Choose a Task List"
@@ -19972,7 +20530,7 @@ msgstr "Valitse käytettävät osoitekirjat."
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Syntymä- ja vuosipäivät"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:145
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "Käyttäjän oletuskalenteri"
 
@@ -20030,6 +20588,11 @@ msgstr "Kelvin (K)"
 msgid "Units:"
 msgstr "Yksiköt:"
 
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+#| msgid "One or more values cannot be empty."
+msgid "Location cannot be empty"
+msgstr "Sijainti ei voi olla tyhjä"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
@@ -20083,97 +20646,87 @@ msgstr "_Tuo tehtäviin"
 msgid "I_mport to Task List"
 msgstr "_Tuo tehtäviin"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:186
-#: ../modules/calendar/e-cal-shell-view-actions.c:162
-msgid "New Calendar"
-msgstr "Uusi kalenteri"
-
-#: ../modules/calendar/e-cal-base-shell-backend.c:190
-#: ../modules/calendar/e-memo-shell-view-actions.c:164
+#: ../modules/calendar/e-cal-base-shell-backend.c:187
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:194
-#: ../modules/calendar/e-task-shell-view-actions.c:187
-msgid "New Task List"
-msgstr "Uusi tehtävälista"
-
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
 #, fuzzy, c-format
 #| msgid "Copying an event into the calendar %s"
 msgid "Copying an event into the calendar '%s'"
 msgstr "Kopioidaan tapahtumaa kalenteriin %s"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Moving an event into the calendar '%s'"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Copying a memo into the memo list '%s'"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Moving a memo into the memo list '%s'"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Copying a task into the task list '%s'"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Moving a task into the task list '%s'"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../modules/calendar/e-calendar-preferences.c:520
+#: ../modules/calendar/e-calendar-preferences.c:515
 #, fuzzy
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
-#: ../modules/calendar/e-calendar-preferences.c:616
+#: ../modules/calendar/e-calendar-preferences.c:611
 msgid "Meeting Invitations"
 msgstr "Kokouskutsut"
 
-#: ../modules/calendar/e-calendar-preferences.c:642
+#: ../modules/calendar/e-calendar-preferences.c:637
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../modules/calendar/e-calendar-preferences.c:656
-#: ../modules/calendar/e-calendar-preferences.c:687
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:671
+#: ../modules/calendar/e-calendar-preferences.c:666
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
-#: ../modules/calendar/e-calendar-preferences.c:1057
+#: ../modules/calendar/e-calendar-preferences.c:1064
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../modules/calendar/e-calendar-preferences.c:1058
+#: ../modules/calendar/e-calendar-preferences.c:1065
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -20217,6 +20770,10 @@ msgstr "_Toinen aikavyöhyke:"
 msgid "(Shown in a Day View)"
 msgstr "(Näytetään päivänäkymässä)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Aika_vyöhyke:"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Näytä _järjestelmän aikavyöhyke"
@@ -20234,7 +20791,7 @@ msgid "_24 hour"
 msgstr "_24 tuntia"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "Työviikko"
 
@@ -20256,148 +20813,186 @@ msgstr "_Päivä alkaa:"
 msgid "_Mon"
 msgstr "_Ma"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "Maanantai"
+
 #. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Ti"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "Tiistai"
+
 #. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Ke"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "_To"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "Torstai"
+
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Pe"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "Perjantai"
+
 #. Saturday
 #: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_La"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "Lauantai"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "_Su"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "Sunnuntai"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Päivä _päättyy:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Create events, memos and tasks as _Private by default"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 #, fuzzy
 #| msgid "Send Options"
 msgid "View Options"
 msgstr "Lähetysasetukset"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "_Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#, fuzzy
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment _icons in the month view"
+msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "Näytä viikko_numerot"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "Vie_ritä kuukausinäkymää viikoittain"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "Hälytykset"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "Näytä"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "Korosta _tänään erääntyvät tehtävät"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 #, fuzzy
 msgid "Display reminders in _notification area only"
 msgstr "Näytä hälytykset vain _ilmoitusalueella"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 #, fuzzy
 #| msgid "Delete completed tasks"
 msgid "Display reminders for completed _tasks"
 msgstr "Poista valmistuneet tehtävät"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Sh_ow a reminder"
 msgstr "_Näytä muistutus"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every appointment"
 msgstr "ennen tapaamista"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Show a _reminder"
 msgstr "Näytä _muistutus"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default _snooze time (in minutes)"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 #, fuzzy
 msgid "Select the calendars for reminder notification"
 msgstr "Valitse kalenterit, joiden hälytykset lähetetään"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default Free/Busy Server"
 msgstr "Oletus-vapaa/varattu-palvelin"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:82
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../modules/calendar/e-calendar-preferences.ui.h:83
 #, fuzzy
 msgid "Publishing Information"
 msgstr "Julkaisupaikka"
@@ -20408,7 +21003,7 @@ msgid "_Appointment"
 msgstr "_Tapaaminen"
 
 #: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
@@ -20436,7 +21031,7 @@ msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
 #: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -20444,15 +21039,15 @@ msgstr "Luo uusi kalenteri"
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:267
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:296
+#: ../modules/calendar/e-cal-shell-view-actions.c:314
 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 "
@@ -20463,11 +21058,11 @@ 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:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -20475,329 +21070,344 @@ msgstr "Muuta tämä kerta _siirrettäväksi"
 
 #. 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:1055
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1057
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
-#: ../modules/calendar/e-memo-shell-view-actions.c:469
-#: ../modules/calendar/e-task-shell-view-actions.c:587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1088
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:498
+#: ../modules/calendar/e-task-shell-view-actions.c:617
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1191
-#: ../modules/calendar/e-memo-shell-view-actions.c:550
-#: ../modules/calendar/e-task-shell-view-actions.c:675
+#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#| msgid "_Save as iCalendar..."
+msgid "_Manage Calendar groups..."
+msgstr "_Hallitse kalenteriryhmiä..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1247
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi hakuehdon seuraava esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi hakuehdon edellinen esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#, fuzzy
+#| msgid "Show _Only This Calendar"
+msgid "Sho_w All Calendars"
+msgstr "Näytä _vain tämä kalenteri"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "Uusi koko pä_ivän tapahtuma..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1338
-#: ../modules/calendar/e-cal-shell-view-memopad.c:242
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-memo-shell-view-actions.c:543
-#: ../modules/calendar/e-task-shell-view-actions.c:668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "_Muunna kokoukseksi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1528
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "Päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1537
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1544
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "Viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1635
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:957
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:1040
 msgid "_Save as iCalendar..."
 msgstr "_Tallenna iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 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:206
-#: ../modules/calendar/e-memo-shell-view-actions.c:467
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:249
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:65
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:256
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "Näytä valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
@@ -20831,58 +21441,58 @@ msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. 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:274
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtävät keskeneräisiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-backend.c:64
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
@@ -20906,84 +21516,98 @@ msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
 #: ../modules/calendar/e-memo-shell-backend.c:82
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:529
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:536
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "_Etsi muistilapusta..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:538
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "Etsi tekstiä näytettävästä muistilapusta"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:557
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:559
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
 msgstr "Poista valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "Manage Memo List groups order and visibility"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#, fuzzy
+#| msgid "Show _Only This Memo List"
+msgid "Sho_w All Memo Lists"
+msgstr "Näytä _vain tämä muistilappuluettelo"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "Poista muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view.c:214
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "Poista muistilappu"
 
@@ -20995,45 +21619,45 @@ msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:539
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr ", %d valittu"
 
-#: ../modules/calendar/e-task-shell-backend.c:62
+#: ../modules/calendar/e-task-shell-backend.c:61
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../modules/calendar/e-task-shell-backend.c:69
+#: ../modules/calendar/e-task-shell-backend.c:68
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:71
+#: ../modules/calendar/e-task-shell-backend.c:70
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../modules/calendar/e-task-shell-backend.c:78
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:81
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:259
+#: ../modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:529
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -21045,107 +21669,117 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:536
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "Älä kysy uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:661
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "_Etsi tehtävästä..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 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:682
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
 msgstr "_Poista tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
 msgstr "Poista valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "_Manage Task List groups..."
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+#, fuzzy
+#| msgid "Show _Only This Task List"
+msgid "Sho_w All Task Lists"
+msgstr "Näytä _vain tämä tehtävälista"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:859
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 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:866
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 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:874
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../modules/calendar/e-task-shell-view.c:316
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../modules/calendar/e-task-shell-view.c:318
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:535
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -21848,151 +22482,189 @@ msgstr ""
 "&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
 "osallistujan &quot;{1}&quot;?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:270
 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:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:279
 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:286
+#: ../modules/mail-config/e-mail-config-google-summary.c:288
 msgid "You may need to enable IMAP access"
 msgstr "Sinun on mahdollisesti sallittava IMAP-käyttö"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 #, fuzzy
 #| msgid "Save directory"
 msgid "Mail _Directory:"
 msgstr "Tallenna kansio"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a MH mail directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#, fuzzy
+#| msgid "One or more values cannot be empty."
+msgid "MH mail directory cannot be empty"
+msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 #, fuzzy
 #| msgid "Choose calendar file"
 msgid "Choose a local delivery file"
 msgstr "Valitse kalenteritiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#, fuzzy
+#| msgid "One or more values cannot be empty."
+msgid "Local delivery file cannot be empty"
+msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a Maildir mail directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#, fuzzy
+#| msgid "Choose a file to restore"
+msgid "Maildir mail directory cannot be empty"
+msgstr "Valitse palautettava tiedosto"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 #, fuzzy
 #| msgid "_File:"
 msgid "Spool _File:"
 msgstr "_Tiedosto:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 #, fuzzy
 #| msgid "Choose a File"
 msgid "Choose a mbox spool file"
 msgstr "Valitse tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#, fuzzy
+#| msgid "One or more values cannot be empty."
+msgid "Mbox spool file cannot be empty"
+msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 #, fuzzy
 #| msgid "Save directory"
 msgid "Spool _Directory:"
 msgstr "Tallenna kansio"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a mbox spool directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+msgid "Mbox spool directory cannot be empty"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
 msgid "Encryption _method:"
 msgstr "Salaus_tapa:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
-msgid "SSL on a dedicated port"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#, fuzzy
+#| msgid "SSL on a dedicated port"
+msgid "TLS on a dedicated port"
 msgstr "SSL tietyssä portissa"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 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
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "_Omavalintainen binääri:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 #, fuzzy
 #| msgid "Use custom fonts"
 msgid "U_se custom arguments"
 msgstr "Käytä omia fontteja"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 #, fuzzy
 #| msgid "_Arguments:"
 msgid "Cus_tom arguments:"
 msgstr "_Argumentit:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 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-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
 #, 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:135
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+#, fuzzy
+#| msgid "One or more values cannot be empty."
+msgid "Custom binary cannot be empty"
+msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
+
+#. do not reference
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
@@ -22066,12 +22738,10 @@ msgid "Marking messages as read..."
 msgstr "Merkitään viestejä luetuiksi..."
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1038
-#| msgid "Copy to Folder"
 msgid "Go to Folder"
 msgstr "Siirry kansioon"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1042
-#| msgid "Select"
 msgid "_Select"
 msgstr "_Valitse"
 
@@ -22192,7 +22862,6 @@ 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:1765
-#| msgid "Copy to Folder"
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
@@ -22318,132 +22987,156 @@ msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2004
+#, fuzzy
+#| msgid "Show _Deleted Messages"
+msgid "Show _Junk Messages"
+msgstr "Näytä _poistetut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#, fuzzy
+#| msgid "Show deleted messages with a line through them"
+msgid "Show junk messages with a red line through them"
+msgstr "Näytä poistetut viestit yliviivattuna"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 #, 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:2034
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2041
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#, fuzzy
+#| msgid "Messages with Attachments"
+msgid "Messages with Notes"
+msgstr "Viestit, joissa on liitteitä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2099
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2106
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2098
+#: ../modules/mail/e-mail-shell-view-actions.c:2113
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2157
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#, fuzzy
+#| msgid "Message Header"
+msgid "Message Thread"
+msgstr "Viestin otsakkeet"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2180
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2167
+#: ../modules/mail/e-mail-shell-view-actions.c:2190
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2174
+#: ../modules/mail/e-mail-shell-view-actions.c:2197
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2181
+#: ../modules/mail/e-mail-shell-view-actions.c:2204
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../modules/mail/e-mail-shell-view.c:700
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:808
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:954
+#: ../modules/mail/e-mail-shell-view-private.c:957
 #, 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:963
-#: ../modules/mail/e-mail-shell-view-private.c:980
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:983
 #, 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:989
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, 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:1002
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, 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:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, 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:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1017
 #, 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:1031
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, fuzzy, c-format
 #| msgid "%d unread, "
 #| msgid_plural "%d unread, "
@@ -22452,7 +23145,7 @@ msgid_plural "%d unread"
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1549
+#: ../modules/mail/e-mail-shell-view-private.c:1552
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
@@ -22474,18 +23167,16 @@ msgid "Keep in Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
 #: ../modules/mail/em-composer-prefs.c:1206
-#, fuzzy
 #| msgid "Send private reply?"
 msgid "Send immediately"
-msgstr "Lähetetäänkö yksityinen vastaus?"
+msgstr "Lähetä välittömästi"
 
 #: ../modules/mail/em-composer-prefs.c:1207
-#, fuzzy
 #| msgid "15 minutes"
 msgid "Send after 5 minutes"
-msgstr "15 minuuttia"
+msgstr "Lähetä 5 minuutin jälkeen"
 
-#: ../modules/mail/em-composer-prefs.c:1280
+#: ../modules/mail/em-composer-prefs.c:1286
 msgid "Language(s)"
 msgstr "Kielet"
 
@@ -22494,17 +23185,14 @@ msgid "On exit, every time"
 msgstr "Poistuessa, joka kerta"
 
 #: ../modules/mail/em-mailer-prefs.c:80
-#| msgid "On exit, once per day"
 msgid "Once per day"
 msgstr "Kerran päivässä"
 
 #: ../modules/mail/em-mailer-prefs.c:81
-#| msgid "On exit, once per week"
 msgid "Once per week"
 msgstr "Kerran viikossa"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-#| msgid "On exit, once per month"
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
@@ -22521,11 +23209,11 @@ 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:1554
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../modules/mail/em-mailer-prefs.c:1555
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
@@ -22633,23 +23321,23 @@ msgstr "Näytä HTML-versio"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 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:82
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "Näytä raakatekstinä, jos mahdollista"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -22657,13 +23345,31 @@ 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:87
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+#, fuzzy
+#| msgid "Show plain text if present"
+msgid "Show plain text if present, or HTML source"
+msgstr "Näytä raakatekstinä, jos mahdollista"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+#, fuzzy
+#| msgid ""
+#| "Show plain text part, if present, otherwise let Evolution choose the best "
+#| "part to show."
+msgid "Show plain text part, if present, otherwise the HTML part source."
+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:93
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid "Only ever show plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -22671,11 +23377,11 @@ msgstr ""
 "Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin "
 "pyydetään."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Näytä _piilotetut HTML-osat liitetiedostoina"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -23036,7 +23742,7 @@ msgstr "Evolutionin www-sivut"
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:465
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Avainsanat"
@@ -23226,8 +23932,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Käynnistä _automaattisesti, kun uutta viestiä on muokattu"
 
-#: ../plugins/external-editor/external-editor.c:484
-#: ../plugins/external-editor/external-editor.c:486
+#: ../plugins/external-editor/external-editor.c:530
+#: ../plugins/external-editor/external-editor.c:532
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -23293,7 +23999,7 @@ msgstr "Lataa uusi _kasvokuva"
 
 #: ../plugins/face/face.c:449
 msgid "Change Face Image"
-msgstr ""
+msgstr "Muuta kasvokuvaa"
 
 #: ../plugins/face/face.c:537
 msgid "Include _Face"
@@ -23320,6 +24026,7 @@ msgid ""
 "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
 "exceed 723 bytes."
 msgstr ""
+"Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
 msgid "Incorrect Face Image Byte Size"
@@ -23337,60 +24044,70 @@ msgid "Not an image"
 msgstr "Tiedosto ei ole kuvatiedosto"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:8
-#| msgid ""
-#| "The file you selected does not look like a valid .png image. Error: {0}"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Valittu tiedosto ei näytä kelvolliselta png-kuvalta. Virhe: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 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:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#, fuzzy
+#| msgid "_Message Source"
+msgid "Copy _Message Archive URL"
+msgstr "_Viestin lähdekoodi"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#, fuzzy
+#| msgid "Redirect (bounce) the selected message to someone"
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 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:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 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:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 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:392
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 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:399
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 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:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -23514,31 +24231,31 @@ msgstr "Uusia sähköpostiviestejä Evolutionissa"
 msgid "Show %s"
 msgstr "Näytä %s"
 
-#: ../plugins/mail-notification/mail-notification.c:685
+#: ../plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "_Soita ääni uuden sähköpostin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:717
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:835
+#: ../plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Näytä ilmoitus uusien _viestien saapuessa"
 
@@ -23551,33 +24268,30 @@ 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:229
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:594
-#| msgid "_Cancel"
+#: ../plugins/mail-to-task/mail-to-task.c:561
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Peru"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:596
-#| msgid "_Edit"
+#: ../plugins/mail-to-task/mail-to-task.c:563
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:598
-#| msgid "_New"
+#: ../plugins/mail-to-task/mail-to-task.c:565
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -23586,7 +24300,7 @@ msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin "
 "lisättyä tapahtumaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -23595,7 +24309,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:622
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -23604,7 +24318,7 @@ msgstr ""
 "Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata "
 "aiemmin lisättyä muistilappua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -23615,7 +24329,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -23626,7 +24340,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -23637,30 +24351,30 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:644
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -23668,7 +24382,7 @@ msgstr ""
 "Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse jokin toinen kalenteri."
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:830
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -23680,7 +24394,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:867
+#: ../plugins/mail-to-task/mail-to-task.c:833
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
@@ -23692,35 +24406,35 @@ 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:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../plugins/mail-to-task/mail-to-task.c:1242
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1283
+#: ../plugins/mail-to-task/mail-to-task.c:1249
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1251
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -23728,18 +24442,20 @@ msgstr "Luo uusi kokous valitusta viestistä"
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtäväksi."
 
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlookin PST-tuoja"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Outlookin omat kansiot (.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Tuo Outlook-viestejä PST-tiedostosta"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlookin omat kansiot (.pst)"
+
 #: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Sähköposti"
@@ -23928,10 +24644,6 @@ msgstr "Muokkaa sijaintia"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "UID"
-
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Kuvauslista"
@@ -24068,41 +24780,41 @@ msgstr "Tallenna _pohjana"
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:380
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:390
+#: ../shell/e-shell.c:409
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/e-shell.c:501
+#: ../shell/e-shell.c:520
 msgid "Preparing to quit"
 msgstr "Valmistellaan sulkemista"
 
-#: ../shell/e-shell.c:507
+#: ../shell/e-shell.c:526
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell.c:1024
+#: ../shell/e-shell.c:1043
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
-#: ../shell/e-shell.c:1203 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell.c:1214
+#: ../shell/e-shell.c:1222
 #, fuzzy
 #| msgid "_Quick Reference"
 msgid "Quick _Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell.c:1216 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../shell/e-shell.c:1217 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "_Lopeta"
 
@@ -24437,14 +25149,13 @@ msgstr "Valitse näkymä: %s"
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:555
-#| msgid "New"
+#: ../shell/e-shell-window.c:567
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Uusi"
@@ -24456,7 +25167,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -24492,7 +25203,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:223
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -24500,13 +25211,13 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:229
+#: ../shell/main.c:225
 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:318
+#: ../shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -24514,40 +25225,40 @@ 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:322
+#: ../shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 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:340
+#: ../shell/main.c:336
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -24556,7 +25267,7 @@ msgstr ""
 "Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa "
 "olla reagoimaton. Järjestelmävirhe: %s"
 
-#: ../shell/main.c:473 ../shell/main.c:478
+#: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
@@ -24629,13 +25340,12 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:13
 msgid "_Close Immediately"
-msgstr ""
+msgstr "_Sulje välittömästi"
 
 #: ../shell/shell.error.xml.h:14
-#, fuzzy
 #| msgid "Waiting..."
 msgid "Keep _Waiting"
-msgstr "Odotetaan..."
+msgstr "Jatka _odottamista"
 
 #: ../shell/shell.error.xml.h:15
 #, fuzzy
@@ -24655,7 +25365,6 @@ msgid "Failed to connect '{0}'"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
 #: ../shell/shell.error.xml.h:18
-#| msgid "_Recover"
 msgid "_Reconnect"
 msgstr "_Yhdistä uudelleen"
 
@@ -24828,20 +25537,17 @@ msgid "%s-backup.p12"
 msgstr "%s-varmuuskopio.p12"
 
 #: ../smime/gui/certificate-manager.c:730
-#, fuzzy
 #| msgid "Certificate"
 msgid "Backup Certificate"
-msgstr "Varmenne"
+msgstr "Varmuuskopioi varmenne"
 
 #. filename selection
 #: ../smime/gui/certificate-manager.c:744
-#| msgid "F_ilename:"
 msgid "_File name:"
 msgstr "_Tiedostonimi:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../smime/gui/certificate-manager.c:749
-#| msgid "Select a file"
 msgid "Please select a file..."
 msgstr "Valitse tiedosto..."
 
@@ -24858,7 +25564,6 @@ msgid ""
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:788
-#| msgid "_Password:"
 msgid "_Repeat Password:"
 msgstr "_Toista salasana:"
 
@@ -24882,10 +25587,9 @@ msgid "No file name provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
 #: ../smime/gui/certificate-manager.c:864
-#, fuzzy
 #| msgid "Failed to import certificate"
 msgid "Failed to backup key and certificate"
-msgstr "Varmenteen tuonti epäonnistui"
+msgstr "Avaimen ja varmenteen varmuuskopiointi epäonnistui"
 
 #: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
@@ -24901,7 +25605,6 @@ msgid "Ask when used"
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:1121
-#| msgid "Never"
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Ei koskaan"
@@ -24943,7 +25646,6 @@ msgid "_Ask when used"
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:1372
-#| msgid "Imported Certificate"
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Älä koskaan luota tähän varmenteeseen"
@@ -24985,7 +25687,6 @@ msgstr ""
 "varmenne tarkasti."
 
 #: ../smime/gui/certificate-manager.c:1395
-#| msgid "_View Certificate"
 msgid "_Display certificate"
 msgstr "_Näytä varmenne"
 
@@ -25002,12 +25703,10 @@ msgid "Host name"
 msgstr "_Listan nimi:"
 
 #: ../smime/gui/certificate-manager.c:1633
-#| msgid "Issued"
 msgid "Issuer"
 msgstr "Myöntäjä"
 
 #: ../smime/gui/certificate-manager.c:1634
-#| msgid "MD5 Fingerprint"
 msgid "Fingerprint"
 msgstr "Sormenjälki"
 
@@ -25016,20 +25715,19 @@ msgid "Trust"
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:1656
-#, fuzzy
 #| msgid "_Edit CA Trust"
 msgid "_Edit Trust"
-msgstr "_Muokkaa CA:n luottamusta"
+msgstr "_Muokkaa luottamusta"
 
-#: ../smime/gui/certificate-manager.c:1975
+#: ../smime/gui/certificate-manager.c:1977
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:1992
+#: ../smime/gui/certificate-manager.c:1994
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:2009
+#: ../smime/gui/certificate-manager.c:2011
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
@@ -25141,7 +25839,6 @@ msgstr ""
 "varmenne tarkasti."
 
 #: ../smime/gui/smime-ui.ui.h:25
-#| msgid "Certificate"
 msgid "C_ertificate:"
 msgstr "_Varmenne:"
 
@@ -25291,6 +25988,230 @@ msgstr "_Eräpäivän kanssa"
 msgid "With _Status"
 msgstr "_Tilan kanssa"
 
+#~ msgid "Edit Reminder"
+#~ msgstr "Muokkaa muistutusta"
+
+#~ msgid "start of appointment"
+#~ msgstr "tapaamisen alkua"
+
+#~ msgid "end of appointment"
+#~ msgstr "tapaamisen päättymistä"
+
+#~ msgid "Add Reminder"
+#~ msgstr "Lisää muistutus"
+
+#~ msgid "Reminder"
+#~ msgstr "Muistutus"
+
+#~ msgid "Repeat"
+#~ msgstr "Toista"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "_Viesti:"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Ääni:"
+
+#~ msgid "Select A File"
+#~ msgstr "Valitse tiedosto"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "Toimenpide/liipaisin"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "Tapahtuma on poistettu."
+
+#~ msgid "This task has been deleted."
+#~ msgstr "Tehtävä on poistettu."
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "Muistilappu on poistettu."
+
+#~ 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?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s Et ole tehnyt muutoksia, sulje muokkain?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "Tapahtumaa on muutettu."
+
+#~ msgid "This task has been changed."
+#~ msgstr "Tehtävää on muutettu."
+
+#~ msgid "This memo has been changed."
+#~ msgstr "Muistilappua on muutettu."
+
+#~ 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?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
+
+#~ msgid "Could not update object"
+#~ msgstr "Kohdetta ei voi päivittää"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Muokkaa tapaamista"
+
+#~ msgid "Keep original item?"
+#~ msgstr "Säilytetäänkö alkuperäinen?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "Synkronointi palvelimen kanssa ei onnistu"
+
+#~ 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"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "Nykyistä versiota ei voi käyttää!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "Tarkistusvirhe: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "Syötä valtuutettu"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Valtuuta:"
+
+#~ msgid "Contacts..."
+#~ msgstr "Yhteystiedot..."
+
+#~ msgid "_Recurrence"
+#~ msgstr "T_oistuvuus"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "Muuta tämä tapahtuma toistuvaksi"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "Lisää erityisiä lähetysvaihtoehtoja"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "_Vapaa/Varattu"
+
+#~ msgid "Print this event"
+#~ msgstr "Tulosta tämä tapahtuma"
+
+#~ msgid "This event has reminders"
+#~ msgstr "Tapahtumaan liittyy muistutuksia"
+
+#~ msgid "Event with no start date"
+#~ msgstr "Tapahtuma ilman alkupäivämäärää"
+
+#~ msgid "Event with no end date"
+#~ msgstr "Tapahtuma ilman päättymispäivää"
+
+#~ msgid "End date is wrong"
+#~ msgstr "Lopetuspäiväys on virheellinen"
+
+#~ msgid "End time is wrong"
+#~ msgstr "Lopetusaika on virheellinen"
+
+#~ msgid "_Delegatees"
+#~ msgstr "_Valtuutetut"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "_Osanottajat"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minuuttia ennen tapaamista"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "Yksi tunti ennen tapaamista"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "Yksi päivä ennen tapaamista"
+
+#~ msgid "_Time:"
+#~ msgstr "_Aika:"
+
+#~ msgid "Event Description"
+#~ msgstr "Tapahtuman kuvaus"
+
+#~ msgid "Print this memo"
+#~ msgstr "Tulosta tämä muistilappu"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "Muistilapun aloitusaika on mennyt"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "_Järjestäjä:"
+
+#~ msgid "T_o:"
+#~ msgstr "Vastaan_ottajat:"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "_Yhteenveto:"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "Valintaa ei voi hakea muokattavaksi."
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "Valintaa ei voitu hakea poistettavaksi."
+
+#~ msgid "Date/Time"
+#~ msgstr "Päiväys/aika"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "päivä"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "kerrat"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "kunnes"
+
+#~ msgid "_Send Options"
+#~ msgstr "_Lähetysasetukset"
+
+#~ msgid "Print this task"
+#~ msgstr "Tulosta tämä tehtävä"
+
+#, 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"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "Eräpäivä on virheellinen"
+
+#~ msgid "Time zone:"
+#~ msgstr "Aikavyöhyke:"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s tapaamisen alussa"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s tapaamisen lopussa"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome-kalenteri"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "Tietojen haku kesken. Haluatko lähettää viestin?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr ""
+#~ " Joidenkin liitteiden lataus on vielä kesken. Viestin lähettäminen "
+#~ "aiheuttaa viestin lähetyksen ilman näitä keskeneräisiä liitteitä "
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
 #~ msgid "Web addresses"
 #~ msgstr "Web-osoitteet"
 



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