[evolution] Updated Finnish translation



commit 11e9426c52ddc364d3f44217ea2dbdc32d14b39f
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Sun Sep 4 08:37:21 2016 +0000

    Updated Finnish translation

 po/fi.po | 5287 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2630 insertions(+), 2657 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 1e494bb..23e648c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -20,11 +20,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2016-03-14 05:52+0000\n"
-"PO-Revision-Date: 2016-03-14 20:32+0200\n"
+"product=evolution&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-09-02 20:32+0000\n"
+"PO-Revision-Date: 2016-09-04 11:35+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
-"Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
+"Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,8 +98,8 @@ msgstr "Poistetaanko osoitekirja \"{0}\"?"
 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:67
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "_Älä poista"
 
@@ -205,15 +205,15 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/e-comp-editor-page-general.c:1357
-#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-mail-signature-manager.c:328
 #: ../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:58 ../modules/mail/em-composer-prefs.c:417
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:416
 #: ../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
+#: ../plugins/templates/templates.c:465
 msgid "_Add"
 msgstr "_Lisää"
 
@@ -341,7 +341,7 @@ msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "Yhteystieto"
 
@@ -350,8 +350,8 @@ msgid "_Home Page:"
 msgstr "K_otisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:631
-#: ../modules/itip-formatter/itip-view.c:1905
+#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../modules/itip-formatter/itip-view.c:2033
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -441,14 +441,14 @@ 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:2037
+#: ../calendar/gui/e-calendar-view.c:2044
 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:2036
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -530,8 +530,8 @@ 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/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-attachment-view.c:357 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:368
 #: ../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
@@ -540,7 +540,7 @@ msgstr "Lisää _X.509"
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
+#: ../plugins/templates/templates.c:475
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -556,14 +556,14 @@ 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/e-comp-editor.c:2103
-#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
+#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
+#: ../e-util/e-attachment-store.c:831
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3863
 #: ../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
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:668
+#: ../smime/gui/certificate-manager.c:745
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -573,15 +573,15 @@ msgid "Certificates"
 msgstr "Varmenteet"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
 #: ../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:1223 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
 #: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Asetukset"
@@ -601,14 +601,14 @@ msgstr "Asetukset"
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
 #: ../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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:666
+#: ../e-util/e-attachment-store.c:830 ../e-util/e-attachment-view.c:303
 #: ../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
-#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
 #: ../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
@@ -616,12 +616,12 @@ msgstr "Asetukset"
 #: ../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:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3862
 #: ../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:16
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
@@ -631,10 +631,10 @@ msgstr "Asetukset"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
-#: ../smime/gui/certificate-manager.c:731
-#: ../smime/gui/certificate-manager.c:955
-#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
+#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:968
+#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Peru"
@@ -696,22 +696,22 @@ msgid "Show Certificates"
 msgstr "Näytä varmenteet"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
 msgid "_Undo"
 msgstr "_Kumoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Kumoa"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Tee uudelleen"
 
@@ -743,8 +743,8 @@ msgid "PGP keys"
 msgstr "PGP-avaimet"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:678
-#: ../smime/gui/certificate-manager.c:967
+#: ../smime/gui/certificate-manager.c:691
+#: ../smime/gui/certificate-manager.c:980
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
@@ -758,10 +758,10 @@ 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: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-attachment-store.c:664 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
 #: ../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
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -843,11 +843,11 @@ 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/e-comp-editor-page-recurrence.c:303
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../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-html-editor-link-dialog.c:257 ../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:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -860,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:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_OK"
@@ -1054,7 +1054,7 @@ msgstr "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:94
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
 msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
@@ -1063,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:340
+#: ../e-util/e-web-view.c:359
 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:352
+#: ../e-util/e-web-view.c:371
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:354
+#: ../e-util/e-web-view.c:373
 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:1069
+#: ../e-util/e-web-view.c:1279
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -1244,7 +1244,12 @@ msgid "Blog"
 msgstr "Blogi"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../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 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/mail-send-recv.c:967
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -1484,16 +1489,15 @@ 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: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
+#: ../calendar/gui/e-comp-editor.c:1997 ../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: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
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1628,7 +1632,7 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
@@ -1660,7 +1664,7 @@ msgstr "Yhteystietoluettelo: "
 msgid "Contact: "
 msgstr "Yhteystiedot: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
@@ -1672,7 +1676,7 @@ msgstr "Uusi yhteystieto"
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1690,14 +1694,14 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2424
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2106
-#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../e-util/e-html-editor-actions.c:1858
+#: ../e-util/e-html-editor-find-dialog.c:252
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Etsi"
@@ -1760,59 +1764,70 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:485
-#: ../calendar/importers/icalendar-importer.c:980
-#: ../calendar/importers/icalendar-importer.c:1019
-#: ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:481
+#: ../calendar/importers/icalendar-importer.c:978
+#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:929
+#, fuzzy
+#| msgid "Can not open file"
+msgid "Can't open .csv file"
+msgstr "Tiedostoa ei voi avata"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:814
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+#, fuzzy
+#| msgid "Can not open file"
+msgid "Can't open .ldif file"
+msgstr "Tiedostoa ei voi avata"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:815
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:642
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:643
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
@@ -1823,50 +1838,6 @@ msgstr "Evolutionin vCard-tuoja"
 msgid "Page %d"
 msgstr "Sivu %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
-msgid "Specify the output file instead of standard output"
-msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:55
-msgid "OUTPUTFILE"
-msgstr "TULOSTIEDOSTO"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local address book folders"
-msgstr "Näytä paikalliset osoitekirjakansiot"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-msgid "Show cards as vcard or csv file"
-msgstr "Nämä kortit vcard- tai cvs-tiedostoina"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "[vcard|csv]"
-msgstr "[vcard|cvs]"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:111
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi käyttöohjeet."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:125
-msgid "Only support csv or vcard format."
-msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:156
-msgid "Unhandled error"
-msgstr "Käsittelemätön virhe"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "Tiedostoa ei voi avata"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, fuzzy, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
-
 #: ../addressbook/util/eab-book-util.c:36
 #, fuzzy
 #| msgid "Work Email"
@@ -2020,7 +1991,7 @@ msgid "Start time"
 msgstr "Alkamisaika"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "Tapaamiset"
 
@@ -2034,15 +2005,15 @@ msgstr "_Torku"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
+#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
+#: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
 #: ../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
+#: ../plugins/templates/templates.c:470 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -2056,11 +2027,11 @@ msgid "_Dismiss"
 msgstr "_Hylkää"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1514
-#: ../modules/itip-formatter/itip-view.c:1625
+#: ../modules/itip-formatter/itip-view.c:1666
+#: ../modules/itip-formatter/itip-view.c:1777
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -2092,23 +2063,23 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Evolution-muistuttajat"
 
@@ -2119,21 +2090,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:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Ei"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2150,16 +2121,25 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "epäkelpo aika"
 
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d päivä"
+msgstr[1] "%d päivää"
+
 #. 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/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -2168,7 +2148,7 @@ msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
 #. 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/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2179,7 +2159,7 @@ 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"
 #. 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/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2323,8 +2303,7 @@ msgstr "Olet tehnyt tallentamattomia muutoksia tähän tapaamiseen."
 msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
@@ -2362,8 +2341,8 @@ msgid ""
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat kuitata osanottonsa."
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:36 ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40 ../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ä"
@@ -2918,7 +2897,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:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Kuvaus"
@@ -2958,8 +2937,8 @@ msgstr "Henkilökohtainen"
 
 #: ../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
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:115
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
@@ -2974,8 +2953,8 @@ msgstr "Järjestäjä"
 msgid "Attendee"
 msgstr "Osanottaja"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
@@ -3008,7 +2987,7 @@ msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -3131,14 +3110,6 @@ 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"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-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"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
@@ -3149,52 +3120,45 @@ msgstr[1] "%d viikkoa"
 
 #. 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
 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:454
 #, c-format
-#| 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:460
 #, c-format
-#| msgid "%s %s after the start of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
 msgstr "%s %s alun jälkeen"
@@ -3210,14 +3174,12 @@ msgstr "Liite: %s"
 
 #: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-#| 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:485
 #, c-format
-#| 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"
@@ -3267,8 +3229,8 @@ 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:214 ../e-util/e-filter-rule.c:768
-#: ../mail/e-mail-config-page.c:125
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -3293,8 +3255,8 @@ msgid "Due Date:"
 msgstr "Eräpäivä:"
 
 #: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1517
-#: ../modules/itip-formatter/itip-view.c:1634
+#: ../modules/itip-formatter/itip-view.c:1669
+#: ../modules/itip-formatter/itip-view.c:1786
 msgid "Status:"
 msgstr "Tila:"
 
@@ -3313,19 +3275,10 @@ msgstr "Työn alla"
 #: ../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
+#: ../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
@@ -3340,20 +3293,20 @@ msgstr "Prioriteetti:"
 
 #: ../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
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
 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
+#: ../mail/message-list.c:317
 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
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
 msgid "Low"
 msgstr "Matala"
 
@@ -3561,7 +3514,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:1830 ../calendar/gui/e-memo-table.c:492
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3570,7 +3523,7 @@ 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:1834 ../calendar/gui/e-memo-table.c:497
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
@@ -3578,7 +3531,7 @@ msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
@@ -3589,10 +3542,10 @@ msgstr "Sijainti: %s"
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
-#: ../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
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -3601,13 +3554,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:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
 #: ../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:2296
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -3617,15 +3570,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:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
 #: ../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:2303
-#: ../calendar/gui/e-calendar-view.c:2309
-#: ../calendar/gui/e-calendar-view.c:2312
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
@@ -3658,13 +3611,13 @@ msgstr "Viimeksi muokattu"
 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-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../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: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/itip-formatter/itip-view.c:3318
+#: ../modules/itip-formatter/itip-view.c:5915
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -3702,43 +3655,39 @@ msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
 #: ../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-list-view.c:209
 #: ../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:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:3820
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6206
+#: ../modules/itip-formatter/itip-view.c:5903
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-cal-model.c:3821
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6212
+#: ../modules/itip-formatter/itip-view.c:5909
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-cal-model.c:3822
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
 #: ../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:3823
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6215
+#: ../modules/itip-formatter/itip-view.c:5912
 msgid "Delegated"
 msgstr "Valtuutettu"
 
@@ -3748,8 +3697,7 @@ msgstr "Vaatii toimenpiteitä"
 
 #. 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-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
 #: ../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
@@ -4024,127 +3972,121 @@ msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 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-event.c:438
 #: ../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"
+#: ../calendar/gui/e-comp-editor-event.c:440
 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
+#: ../calendar/gui/e-comp-editor-event.c:444
+#: ../calendar/gui/e-comp-editor-event.c:460
+#: ../calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2021
+#: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
+#: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
+#: ../smime/gui/certificate-manager.c:359
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../calendar/gui/e-comp-editor-event.c:366
+#: ../calendar/gui/e-comp-editor-event.c:454
 #, 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
+#: ../calendar/gui/e-comp-editor-event.c:456
 #, 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-event.c:588
 #: ../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-event.c:590
 #: ../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
+#: ../calendar/gui/e-comp-editor-event.c:596
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/e-comp-editor-event.c:500
+#: ../calendar/gui/e-comp-editor-event.c:598
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/e-comp-editor-event.c:506
+#: ../calendar/gui/e-comp-editor-event.c:604
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/e-comp-editor-event.c:508
+#: ../calendar/gui/e-comp-editor-event.c:606
 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
+#: ../calendar/gui/e-comp-editor-event.c:612
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/e-comp-editor-event.c:516
+#: ../calendar/gui/e-comp-editor-event.c:614
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../calendar/gui/e-comp-editor-event.c:525
+#: ../calendar/gui/e-comp-editor-event.c:623
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:527
+#: ../calendar/gui/e-comp-editor-event.c:625
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/e-comp-editor-event.c:532
+#: ../calendar/gui/e-comp-editor-event.c:630
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:534
+#: ../calendar/gui/e-comp-editor-event.c:632
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/e-comp-editor-event.c:539
+#: ../calendar/gui/e-comp-editor-event.c:637
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/e-comp-editor-event.c:541
+#: ../calendar/gui/e-comp-editor-event.c:639
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/e-comp-editor-event.c:642
-#| msgid "_Start time:"
+#: ../calendar/gui/e-comp-editor-event.c:740
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-comp-editor-event.c:647
-#| msgid "_End time:"
+#: ../calendar/gui/e-comp-editor-event.c:745
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-comp-editor-event.c:657
-#| msgid "All _Day Event"
+#: ../calendar/gui/e-comp-editor-event.c:755
 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-event.c:808
 #: ../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-event.c:811
 #: ../calendar/gui/e-comp-editor-task.c:535
 #, fuzzy
 #| msgid "Reminders"
@@ -4152,32 +4094,31 @@ msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../calendar/gui/e-comp-editor-event.c:716
+#: ../calendar/gui/e-comp-editor-event.c:814
 #, fuzzy
 #| msgid "Recurrence"
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-event.c:817
 #: ../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
+#: ../calendar/gui/e-comp-editor-event.c:827
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../calendar/gui/e-comp-editor-event.c:758
+#: ../calendar/gui/e-comp-editor-event.c:859
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:759
+#: ../calendar/gui/e-comp-editor-event.c:860
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
@@ -4208,7 +4149,6 @@ 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ä:"
@@ -4226,8 +4166,8 @@ 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
+#: ../em-format/e-mail-formatter-attachment.c:337
+#: ../e-util/e-attachment-bar.c:103 ../e-util/e-attachment-bar.c:108
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
@@ -4235,19 +4175,19 @@ msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../e-util/e-attachment.c:2542
+#: ../calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../e-util/e-attachment.c:2424
 #, 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
+#: ../calendar/gui/e-comp-editor-page-attachments.c:198
+#: ../e-util/e-attachment.c:2427
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#: ../calendar/gui/e-comp-editor-page-attachments.c:403
 #, fuzzy
 #| msgid ""
 #| "Some attachments are being downloaded. Saving the task would result in "
@@ -4259,44 +4199,41 @@ 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
+#: ../calendar/gui/e-comp-editor-page-attachments.c:430
 #, c-format
 msgid "Attachment '%s' cannot be found, remove it from the list, please"
 msgstr ""
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#: ../calendar/gui/e-comp-editor-page-attachments.c:447
 #, 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
+#: ../calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../composer/e-composer-actions.c:319
 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
+#: ../calendar/gui/e-comp-editor-page-attachments.c:610
+#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:627
-#| msgid "Attachments"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:617
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:629
-#| msgctxt "iCalImp"
-#| msgid "has attachments"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:619
 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
+#: ../calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../e-util/e-attachment-bar.c:766 ../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
+#: ../calendar/gui/e-comp-editor-page-attachments.c:774
+#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Luettelonäkymä"
 
@@ -4321,7 +4258,6 @@ 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"
 
@@ -4377,22 +4313,21 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
 msgid "on"
 msgstr "Käytössä"
 
@@ -4400,7 +4335,7 @@ msgstr "Käytössä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
 #, fuzzy
 #| msgid "first"
 msgctxt "ECompEditorPageRecur"
@@ -4412,7 +4347,7 @@ msgstr "ensimmäinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
 #, fuzzy
 #| msgid "second"
 msgctxt "ECompEditorPageRecur"
@@ -4423,7 +4358,7 @@ msgstr "toinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
 #, fuzzy
 #| msgid "third"
 msgctxt "ECompEditorPageRecur"
@@ -4434,7 +4369,7 @@ msgstr "kolmas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
 #, fuzzy
 #| msgid "fourth"
 msgctxt "ECompEditorPageRecur"
@@ -4445,7 +4380,7 @@ msgstr "neljäs"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
 #, fuzzy
 #| msgid "fifth"
 msgctxt "ECompEditorPageRecur"
@@ -4456,7 +4391,7 @@ msgstr "viides"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
 #, fuzzy
 #| msgid "last"
 msgctxt "ECompEditorPageRecur"
@@ -4465,7 +4400,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
 #, fuzzy
 #| msgid "Other Date"
 msgctxt "ECompEditorPageRecur"
@@ -4476,7 +4411,7 @@ msgstr "Toinen päiväys"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
 #, fuzzy
 #| msgid "1st to 10th"
 msgctxt "ECompEditorPageRecur"
@@ -4487,7 +4422,7 @@ msgstr "1. - 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
 #, fuzzy
 #| msgid "11th to 20th"
 msgctxt "ECompEditorPageRecur"
@@ -4498,7 +4433,7 @@ msgstr "11. - 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
 #, fuzzy
 #| msgid "21st to 31st"
 msgctxt "ECompEditorPageRecur"
@@ -4508,7 +4443,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
 #, fuzzy
 #| msgid "day"
 #| msgid_plural "days"
@@ -4516,49 +4451,49 @@ msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "päivä"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
 #, fuzzy
 #| msgid "Monday"
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
 #, fuzzy
 #| msgid "Tuesday"
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
 #, fuzzy
 #| msgid "Wednesday"
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
 #, fuzzy
 #| msgid "Thursday"
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
 #, fuzzy
 #| msgid "Friday"
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
 #, fuzzy
 #| msgid "Saturday"
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
 #, fuzzy
 #| msgid "Sunday"
 msgctxt "ECompEditorPageRecur"
@@ -4568,14 +4503,14 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
 #, fuzzy
 #| msgid "on the"
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
 #, fuzzy
 #| msgid "occurrences"
 msgctxt "ECompEditorPageRecur"
@@ -4583,8 +4518,8 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
 #, fuzzy
 #| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
@@ -4592,7 +4527,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
 #, fuzzy
 #| msgid "This task recurs"
 msgctxt "ECompEditorPageRecur"
@@ -4600,7 +4535,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
 #, fuzzy
 #| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
@@ -4608,39 +4543,39 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
 #, 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
 #, 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
 #, 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
 #, fuzzy
 #| msgid "Recurrence"
 msgid "R_ecurrence"
 msgstr "Toistuvuus"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
 #, 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
 #, fuzzy
 #| msgid "Every"
 msgctxt "ECompEditorPageRecur"
@@ -4648,7 +4583,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "ECompEditorPageRecur"
@@ -4656,7 +4591,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "week(s)"
@@ -4665,7 +4600,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "month(s)"
@@ -4674,7 +4609,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "year(s)"
@@ -4683,7 +4618,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
 #, fuzzy
 #| msgctxt "eventpage"
 #| msgid "for"
@@ -4692,7 +4627,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
 #, fuzzy
 #| msgctxt "eventpage"
 #| msgid "until"
@@ -4701,7 +4636,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
 #, fuzzy
 #| msgctxt "recurrpage"
 #| msgid "forever"
@@ -4709,28 +4644,28 @@ msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
 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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
 #: ../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
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -4740,82 +4675,72 @@ msgstr "Esikatselu"
 msgid "Send To"
 msgstr "Lähetä:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
 #, 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
 #: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
 #, fuzzy
 #| msgid "Custom"
 msgctxt "cal-reminders"
@@ -4823,7 +4748,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
 #, fuzzy
 #| msgid "minute(s)"
 msgctxt "cal-reminders"
@@ -4831,7 +4756,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
 #, fuzzy
 #| msgid "hour(s)"
 msgctxt "cal-reminders"
@@ -4839,7 +4764,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "cal-reminders"
@@ -4847,7 +4772,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
 #, fuzzy
 #| msgid "before"
 msgctxt "cal-reminders"
@@ -4855,7 +4780,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
 #, fuzzy
 #| msgid "after"
 msgctxt "cal-reminders"
@@ -4863,7 +4788,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
 #, fuzzy
 #| msgid "Start"
 msgctxt "cal-reminders"
@@ -4871,7 +4796,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
 #, fuzzy
 #| msgid "_Send"
 msgctxt "cal-reminders"
@@ -4879,14 +4804,14 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
 #, 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
 #, fuzzy
 #| msgid "extra times every"
 msgctxt "cal-reminders"
@@ -4894,7 +4819,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
 #, fuzzy
 #| msgid "minutes"
 msgctxt "cal-reminders"
@@ -4902,7 +4827,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
 #, fuzzy
 #| msgid "hours"
 msgctxt "cal-reminders"
@@ -4910,7 +4835,7 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
 #, fuzzy
 #| msgid "days"
 msgctxt "cal-reminders"
@@ -4918,35 +4843,34 @@ 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
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
 #, fuzzy
 #| msgid "Custom _message"
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
 #, 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"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
 msgid "Select a sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
@@ -4970,7 +4894,6 @@ msgid "_Summary:"
 msgstr "_Yhteenveto:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:325
-#| msgid "_Location:"
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Sijainti:"
@@ -4983,13 +4906,11 @@ 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:"
@@ -5009,13 +4930,11 @@ 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"
@@ -5035,31 +4954,28 @@ 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"
+#, fuzzy
+#| msgid "Cancelled"
 msgctxt "ECompEditor"
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Peruttu"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1182
-#| msgid "_Status:"
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
@@ -5072,37 +4988,31 @@ 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:"
@@ -5168,106 +5078,104 @@ msgstr "Tehtävänanto - %s"
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/e-comp-editor.c:254
+#: ../calendar/gui/e-comp-editor.c:255
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/e-comp-editor.c:609
+#: ../calendar/gui/e-comp-editor.c:610
 #, 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"
+#: ../calendar/gui/e-comp-editor.c:995
 msgid "Saving changes..."
 msgstr "Tallennetaan muutoksia..."
 
-#: ../calendar/gui/e-comp-editor.c:1247
+#: ../calendar/gui/e-comp-editor.c:1251
 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
+#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
+#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
 #: ../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
+#: ../mail/e-mail-notes.c:931 ../mail/em-folder-properties.c:786
+#: ../mail/em-subscription-editor.c:1765
 #: ../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
+#: ../smime/gui/certificate-manager.c:2214
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../calendar/gui/e-comp-editor.c:1974
+#: ../calendar/gui/e-comp-editor.c:1978
 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
+#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:146 ../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
+#: ../calendar/gui/e-comp-editor.c:1985 ../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
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
+#: ../e-util/e-web-view.c:1811 ../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
+#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:871 ../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
+#: ../calendar/gui/e-comp-editor.c:1992 ../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
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1801
 #: ../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
+#: ../calendar/gui/e-comp-editor.c:1999 ../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
+#: ../calendar/gui/e-comp-editor.c:2006
 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
+#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:878 ../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
+#: ../calendar/gui/e-comp-editor.c:2013 ../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
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1821
 #: ../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
+#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
+#: ../mail/e-mail-reader.c:2326
 #: ../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
+#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
 #: ../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
@@ -5275,52 +5183,52 @@ msgstr "T_ulosta..."
 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
+#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
 #: ../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
+#: ../calendar/gui/e-comp-editor.c:2034 ../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
+#: ../calendar/gui/e-comp-editor.c:2055
 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
+#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:945 ../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
+#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
 #: ../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
+#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/e-comp-editor.c:2105
+#: ../calendar/gui/e-comp-editor.c:2109
 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
+#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
+#: ../mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ../calendar/gui/e-comp-editor.c:2112
+#: ../calendar/gui/e-comp-editor.c:2116
 msgid "Save current changes and close editor"
 msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 
@@ -5344,13 +5252,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:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-day-view.c:3047 ../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:3742
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -5385,94 +5293,94 @@ msgstr "Ei mitään"
 msgid "Select..."
 msgstr "Valitse..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../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:1245
 msgid "Individual"
 msgstr "Henkilö"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
 #: ../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-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Resurssi"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Huone"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
 #: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../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:1263
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
 #: ../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-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-list-view.c:646
 #: ../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
+#: ../e-util/e-attachment-tree-view.c:207
 #: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
@@ -5561,7 +5469,7 @@ msgstr "_Alkamisaika:"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2727
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5570,7 +5478,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -5607,38 +5515,38 @@ msgstr "Kieli"
 msgid "Memos"
 msgstr "Muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../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:539 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../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:559 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../calendar/gui/e-memo-table.c:682
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:688
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:694
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../calendar/gui/e-memo-table.c:700
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -5662,7 +5570,7 @@ msgstr "%d %%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1117
+#: ../calendar/importers/icalendar-importer.c:1116
 #: ../data/evolution.desktop.in.in.h:12
 #: ../modules/calendar/e-calendar-preferences.ui.h:65
 #: ../modules/calendar/e-cal-shell-content.c:1627
@@ -5672,24 +5580,24 @@ msgstr "%d %%"
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../calendar/gui/e-task-table.c:998
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1004
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1010
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../calendar/gui/e-task-table.c:1016
+#: ../calendar/gui/e-task-table.c:1051
 #: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
@@ -5705,7 +5613,7 @@ msgstr "Aloituspäivä"
 msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5734,32 +5642,32 @@ msgstr "Valitse aikavyöhyke"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
-#: ../calendar/gui/itip-utils.c:842
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:706
 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:930 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:942
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -5767,7 +5675,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:979
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -5776,7 +5684,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:986
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -5788,7 +5696,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:993 ../calendar/gui/itip-utils.c:1041
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -5797,7 +5705,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:1000
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -5805,7 +5713,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:1013
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -5813,7 +5721,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:1020
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -5821,7 +5729,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:1027
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -5829,47 +5737,47 @@ 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:1034
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:1112
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:1120
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:1149
+#: ../calendar/gui/itip-utils.c:1156
 #, 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:1154
+#: ../calendar/gui/itip-utils.c:1161
 msgid "Unable to book a resource, error: "
 msgstr "Resurssin varaaminen ei onnistu, virhe:"
 
-#: ../calendar/gui/itip-utils.c:1325
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/itip-utils.c:1933
+#: ../calendar/gui/itip-utils.c:1986
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending an event"
 msgstr "Lähetetään viestiä"
 
-#: ../calendar/gui/itip-utils.c:1937
+#: ../calendar/gui/itip-utils.c:1990
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../calendar/gui/itip-utils.c:1941
+#: ../calendar/gui/itip-utils.c:1994
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
@@ -6137,42 +6045,40 @@ msgstr "on vähemmän kuin"
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:308
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:311
 #: ../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"
+#: ../calendar/importers/icalendar-importer.c:353
 msgid "Cre_ate new calendar"
 msgstr "_Luo uusi kalenteri"
 
-#: ../calendar/importers/icalendar-importer.c:361
-#| msgid "Create a new task list"
+#: ../calendar/importers/icalendar-importer.c:357
 msgid "Cre_ate new task list"
 msgstr "Luo _uusi tehtävälista"
 
-#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:503
 #: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:656
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:748
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "Muistutus!"
 
@@ -6184,158 +6090,158 @@ msgstr "vCalendar-tiedostot (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1110
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1152
 #, fuzzy
 #| msgid "New Calendar"
 msgid "GNOME Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/importers/icalendar-importer.c:1231
-#: ../calendar/importers/icalendar-importer.c:1541
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1255
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1268
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1271
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1283
-#: ../calendar/importers/icalendar-importer.c:1583
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1297
-#: ../calendar/importers/icalendar-importer.c:1578
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1329
 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:1354
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1362
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1373
-#: ../calendar/importers/icalendar-importer.c:1376
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1396
-#: ../calendar/importers/icalendar-importer.c:1399
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/importers/icalendar-importer.c:1413
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../calendar/importers/icalendar-importer.c:1573
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -7889,158 +7795,144 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../composer/e-composer-actions.c:212
+#: ../composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:328
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:333
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:335
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
+#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
+#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:349
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:354
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:356
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:363
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:387
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:394
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:396
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:401
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:403
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:411
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:413
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:421
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:427
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:429
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Näytä kokoelma kuvia, joita voi raahata viesteihin"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:435
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:437
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:443
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:445
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:451
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:453
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:461
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:523
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#, fuzzy
-#| msgid "Unicode"
-msgid "Unicode emoticons"
-msgstr "Unicode"
-
-#: ../composer/e-composer-actions.c:525
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-#, 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
+#: ../composer/e-composer-actions.c:515
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:533
+#: ../composer/e-composer-actions.c:517
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:539
+#: ../composer/e-composer-actions.c:523
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:525
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../composer/e-composer-actions.c:547
+#: ../composer/e-composer-actions.c:531
 msgid "_From Override Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:549
+#: ../composer/e-composer-actions.c:533
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid ""
@@ -8048,26 +7940,26 @@ msgid ""
 "displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../composer/e-composer-actions.c:555
+#: ../composer/e-composer-actions.c:539
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:557
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:596
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:602
 msgid "Save Draft"
 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:323
+#: ../mail/e-mail-config-identity-page.c:341
 #: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Nimi:"
@@ -8117,7 +8009,7 @@ msgid "S_ubject:"
 msgstr "_Aihe:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:516
+#: ../mail/e-mail-config-identity-page.c:534
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
@@ -8129,7 +8021,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:874
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -8137,7 +8029,7 @@ msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:883
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8146,12 +8038,12 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2403
 #: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4995
+#: ../composer/e-msg-composer.c:4728
 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)"
@@ -8278,7 +8170,7 @@ msgstr ""
 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:28 ../mail/mail.error.xml.h:169
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:175
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Ilmoitettu virhe oli &quot;{0}&quot;."
 
@@ -8308,8 +8200,6 @@ msgid ""
 msgstr ""
 
 #: ../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 lähettää tämän viestin?"
 
@@ -8343,6 +8233,11 @@ msgstr "Osoitteen muotoilu"
 msgid "Lose _formatting"
 msgstr "Osoitteen muotoilu"
 
+#: ../composer/mail-composer.error.xml.h:41
+#, fuzzy
+msgid "An error occurred while saving to your Templates folder."
+msgstr "Tapahtui virhe käynnistettäessä %s: %s."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolutionin hälytysilmoitukset"
@@ -8352,7 +8247,7 @@ msgid "Calendar event notifications"
 msgstr "Kalenteritapahtumien ilmoitukset"
 
 #: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1118
+#: ../mail/e-mail-browser.c:1101
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8377,7 +8272,6 @@ msgstr ""
 "osoitekirja;tehtävä;"
 
 #: ../data/evolution.desktop.in.in.h:6
-#| msgid "New _Window"
 msgid "New Window"
 msgstr "Uusi ikkuna"
 
@@ -8391,7 +8285,7 @@ msgstr "Yhteystiedot"
 #: ../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
+#: ../smime/gui/certificate-manager.c:1684
 msgid "Mail"
 msgstr "Sähköposti"
 
@@ -8694,7 +8588,6 @@ 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
-#| msgid "Workday start hour"
 msgid "Workday start time for Monday"
 msgstr "Työpäivän alkamisaika maanantaille"
 
@@ -8707,7 +8600,6 @@ 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
-#| msgid "Workday end hour"
 msgid "Workday end time for Monday"
 msgstr "Työpäivän päättymisaika maanantaille"
 
@@ -8719,7 +8611,6 @@ 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
-#| msgid "Workday start minute"
 msgid "Workday start time for Tuesday"
 msgstr "Työpäivän alkamisaika tiistaille"
 
@@ -8731,57 +8622,46 @@ 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
-#| msgid "Workday end minute"
 msgid "Workday end time for Tuesday"
 msgstr "Työpäivän päättymisaika tiistaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-#| msgid "Workday start minute"
 msgid "Workday start time for Wednesday"
 msgstr "Työpäivän alkamisaika keskiviikolle"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#| msgid "Workday end minute"
 msgid "Workday end time for Wednesday"
 msgstr "Työpäivän päättymisaika keskiviikolle"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-#| msgid "Workday start hour"
 msgid "Workday start time for Thursday"
 msgstr "Työpäivän alkamisaika torstaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#| msgid "Workday end hour"
 msgid "Workday end time for Thursday"
 msgstr "Työpäivän päättymisaika torstaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#| msgid "Workday start hour"
 msgid "Workday start time for Friday"
 msgstr "Työpäivän alkamisaika perjantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#| msgid "Workday end hour"
 msgid "Workday end time for Friday"
 msgstr "Työpäivän päättymisaika perjantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#| msgid "Workday start hour"
 msgid "Workday start time for Saturday"
 msgstr "Työpäivän alkamisaika lauantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#| msgid "Workday end hour"
 msgid "Workday end time for Saturday"
 msgstr "Työpäivän päättymisaika lauantaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#| msgid "Workday start hour"
 msgid "Workday start time for Sunday"
 msgstr "Työpäivän alkamisaika sunnuntaille"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#| msgid "Workday end hour"
 msgid "Workday end time for Sunday"
 msgstr "Työpäivän päättymisaika sunnuntaille"
 
@@ -9346,7 +9226,7 @@ msgstr "Sunnuntai on työpäivä"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "Create events, memos and tasks as Private by default"
-msgstr ""
+msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksityisenä oletuksena"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 #, fuzzy
@@ -9446,37 +9326,49 @@ 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
+#, fuzzy
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Name of the editor to prefer in the message composer"
+msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn't correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
 msgid "Path where picture gallery should search for its content"
 msgstr "Polku, josta kuvagallerian tulisi etsiä sisältöä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
 msgid "Automatic link recognition"
 msgstr "Havaitse linkit automaattisesti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Tunnista hymiöt automaattisesti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 #, fuzzy
 #| msgid "Recognize emoticons in text and replace them with images."
 msgid ""
@@ -9486,40 +9378,52 @@ msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 #, fuzzy
+#| msgid "Unicode"
+msgid "Unicode emoticons"
+msgstr "Unicode"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#, fuzzy
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Unicode characters for emoticons."
+msgstr "Käytä Unicode-merkkejä hymiöitä varten."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#, fuzzy
 msgid "Attribute message"
 msgstr "Liitetty viesti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Forward message"
 msgstr "Välitetty viesti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Original message"
 msgstr "Alkuperäinen viesti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Group Reply replies to list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -9527,11 +9431,11 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Put the cursor at the bottom of replies"
 msgstr "Aseta osoitin viestin loppuun vastattaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -9541,35 +9445,35 @@ msgstr ""
 "vastattaessa viestiin. Tämä asetus määrittää, viedäänkö kursori viestin "
 "alkuun vai loppuun."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Always request read receipt"
 msgstr "Pyydä aina kuittaus lukemisesta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Lisätäänkö kaikkiin viesteihin oletuksena kuittauspyyntö."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "Send HTML mail by default."
 msgstr "Lähetä HTML-postia oletuksena."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Spell checking languages"
 msgstr "Oikoluvun kielet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9577,11 +9481,11 @@ msgstr ""
 "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9589,13 +9493,13 @@ msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 #, fuzzy
 #| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show \"From\" override field when sending a mail message"
 msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 #, fuzzy
 #| msgid ""
 #| "Show the \"Cc\" field when sending a mail message. This is controlled "
@@ -9607,11 +9511,11 @@ msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -9619,11 +9523,11 @@ msgstr ""
 "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan "
 "Näytä-valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Näytä \"From\"-kenttä lähetettäessä uutisryhmään"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -9631,11 +9535,11 @@ msgstr ""
 "Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
 "Näytä-valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -9643,24 +9547,24 @@ msgstr ""
 "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan "
 "Näytä-valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 "Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on "
 "allekirjoitettu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 #, fuzzy
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 #, fuzzy
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
@@ -9673,22 +9577,22 @@ msgstr ""
 "UTF-8 merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, "
 "vaan käyttävät virheellistä standardia RFC 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 #, fuzzy
 msgid "Send messages through Outbox folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Put personalized signatures at the top of replies"
 msgstr "Lisää oma allekirjoitus vastauksen alkuun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -9698,21 +9602,21 @@ msgstr ""
 "lisätä vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin "
 "alkuun vai loppuun."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Do not add signature delimiter"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Ignore list Reply-To:"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -9723,27 +9627,17 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "List of localized 'Re'"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#| msgid "Enable express mode"
-msgid "Enable developer mode"
-msgstr "Ota kehittäjätila käyttöön"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enables some hidden actions and tools aimed for development and debugging."
-msgstr ""
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr ""
@@ -9782,18 +9676,28 @@ 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"
+msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid ""
+"Set to 'false' to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Voi olla joko 'mbox' tai 'pdf'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9801,11 +9705,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:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9813,11 +9717,11 @@ msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä "
 "interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9825,186 +9729,197 @@ 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 "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 #, 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 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:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 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:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show notification about missing remote content"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 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:96
-#| msgid "Show photo of the sender"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 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:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 #, 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:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 #, 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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#, fuzzy
+#| msgid "Show Attachment _Bar"
+msgid "Show Attachment Bar"
+msgstr "Näytä _liitepalkki"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 #, 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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 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:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 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."
@@ -10013,31 +9928,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:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -10045,35 +9960,35 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Terminal font"
 msgstr "Päätteen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "The terminal font for mail display."
 msgstr "Päätefontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Use custom fonts"
 msgstr "Käytä omia fontteja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 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:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -10081,11 +9996,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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 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:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -10093,11 +10008,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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -10105,11 +10020,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:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -10117,11 +10032,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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 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:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -10131,11 +10046,11 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on "
@@ -10149,11 +10064,11 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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 "
@@ -10161,46 +10076,46 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 #, fuzzy
 #| msgid ""
 #| "Prompt the user when he or she tries to send a message without a Subject."
@@ -10210,34 +10125,34 @@ msgid ""
 msgstr ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
@@ -10245,7 +10160,7 @@ msgstr ""
 "sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
@@ -10254,21 +10169,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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10276,11 +10191,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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10288,19 +10203,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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -10309,11 +10224,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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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 "
@@ -10321,11 +10236,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -10333,12 +10248,12 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 #, 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:174
+#: ../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 "
@@ -10347,25 +10262,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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 #, 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:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 #, 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -10374,13 +10289,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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
@@ -10389,59 +10304,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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 #, 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 #, 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10449,22 +10364,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:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Show original \"Date\" header value."
 msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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."
@@ -10472,47 +10387,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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 #, 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -10522,11 +10437,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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -10539,7 +10454,7 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
 "osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10547,7 +10462,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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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 "
@@ -10557,12 +10472,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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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 "
@@ -10572,11 +10487,11 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10584,52 +10499,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
 "kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 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:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 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:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 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:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10637,13 +10552,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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 #, 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:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 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 "
@@ -10651,82 +10566,82 @@ msgid ""
 "for deleted messages belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 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:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../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 "
 "\"forward-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../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 "
 "\"reply-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 #, 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:237
+#: ../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 "
 "\"show-headers\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 #, 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:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 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:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 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:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10938,7 +10853,6 @@ msgstr ""
 "Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#| msgid "Beep or play sound file."
 msgid "Whether to play a sound file."
 msgstr "Toistetaanko äänitiedosto."
 
@@ -11025,20 +10939,38 @@ 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:320
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Käynnistetäänkö Evolution verkkoyhteyksillä vai ilman."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
 #, fuzzy
 msgid "Offline folder paths"
 msgstr "Avataan kansiota %s"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
 #, fuzzy
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
@@ -11046,37 +10978,37 @@ msgstr ""
 "Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
 "yhteydettömään käyttöön"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Enable express mode"
 msgstr "Ota pikatila käyttöön"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 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
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "List of button names to hide in the window switcher"
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 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
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the window buttons should be visible."
 msgstr "Näytetäänkö ikkunan napit."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -11086,39 +11018,39 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
 "asetusta."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Toolbar is visible"
 msgstr "Työkalupalkki on näkyvissä"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on näkyvissä"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "Näytetäänkö sivupaneeli."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "Statusbar is visible"
 msgstr "Tilarivi on näkyvissä"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
 msgid "Whether the status bar should be visible."
 msgstr "Näytetäänkö tilarivi."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
 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:26
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
 msgid "Default sidebar width"
 msgstr "Sivupaneelin oletusleveys"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinä."
 
@@ -11152,7 +11084,7 @@ msgid ""
 "arguments."
 msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:425
+#: ../em-format/e-mail-formatter-attachment.c:338
 msgid "Display as attachment"
 msgstr "Näytä liitteenä"
 
@@ -11189,11 +11121,11 @@ msgstr "Tavallinen kuva"
 msgid "Display part as an image"
 msgstr "Näytä seuraava viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:254
+#: ../em-format/e-mail-formatter-message-rfc822.c:250
 msgid "RFC822 message"
 msgstr "RFC822-viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:255
+#: ../em-format/e-mail-formatter-message-rfc822.c:251
 #, fuzzy
 #| msgid "Formatting message"
 msgid "Format part as an RFC822 message"
@@ -11207,7 +11139,7 @@ msgid "Name"
 msgstr "Nimi"
 
 #: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
@@ -11215,8 +11147,7 @@ msgstr "Koko"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67
-#: ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
 msgid "Subject"
 msgstr "Aihe"
 
@@ -11238,19 +11169,19 @@ msgid "Display part as enriched text"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:385
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:386
+#: ../em-format/e-mail-formatter-text-html.c:388
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-actions.c:1300
 msgid "Plain Text"
 msgstr "Raakateksti"
 
@@ -11261,11 +11192,11 @@ msgstr "Raakateksti"
 msgid "Format part as plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11273,11 +11204,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11285,11 +11216,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11297,11 +11228,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11309,23 +11240,30 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid "Signature exists, but need public key"
-msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
-
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../em-format/e-mail-formatter-secure-button.c:50
+#, fuzzy
+#| msgid ""
+#| "This message is signed with a signature, but there is no corresponding "
+#| "public key."
+msgid "This message is signed, but the public key is not in your keyring"
 msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:50
+msgid ""
+"This message was digitally signed, but the corresponding public key is not "
+"present in your keyring. If you want to be able to verify the authenticity "
+"of messages from this person, you should obtain the public key through a "
+"trusted method and add it to your keyring. Until then, there is no guarantee "
+"that this message truly came from that person and that it arrived unaltered."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11333,11 +11271,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11347,11 +11285,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11359,11 +11297,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11373,15 +11311,6 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
-msgid "_View Certificate"
-msgstr "_Näytä varmenne"
-
-#: ../em-format/e-mail-formatter-secure-button.c:202
-msgid "This certificate is not viewable"
-msgstr "Tätä varmennetta ei voi näyttää"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr ""
@@ -11424,8 +11353,8 @@ msgstr "S/MIME-salattu"
 
 #: ../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
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
 msgid "Security"
 msgstr "Turvallisuus"
 
@@ -11519,7 +11448,16 @@ msgstr "Uutisryhmät"
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "_View Certificate"
+msgstr "_Näytä varmenne"
+
+#: ../em-format/e-mail-part-secure-button.c:133
+msgid "This certificate is not viewable"
+msgstr "Tätä varmennetta ei voi näyttää"
+
+#: ../em-format/e-mail-part-utils.c:552
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
@@ -11575,7 +11513,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1851
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Cancel"
 msgstr "Peru"
 
@@ -11594,49 +11532,48 @@ msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 #. * 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:1227
+#: ../e-util/e-attachment.c:1140
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
-#| msgid "Import cancelled."
+#: ../e-util/e-attachment.c:2042 ../e-util/e-attachment.c:3098
 msgid "Operation was cancelled"
 msgstr "Toiminto peruttiin"
 
 #. Translators: Default attachment filename.
-#: ../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
+#: ../e-util/e-attachment.c:2226 ../e-util/e-attachment.c:2945
+#: ../e-util/e-attachment.c:3388 ../e-util/e-attachment-store.c:884
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
+#: ../e-util/e-attachment.c:2307 ../e-util/e-attachment.c:3448
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
+#: ../e-util/e-attachment.c:2315 ../e-util/e-attachment.c:3456
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2830
+#: ../e-util/e-attachment.c:2712
 #, c-format
 msgid "Could not open '%s'"
 msgstr "%s ei voitu avata"
 
-#: ../e-util/e-attachment.c:2833
+#: ../e-util/e-attachment.c:2715
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../e-util/e-attachment.c:3480
+#: ../e-util/e-attachment.c:3465
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../e-util/e-attachment.c:3571
+#: ../e-util/e-attachment.c:3556
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
 
-#: ../e-util/e-attachment.c:3574
+#: ../e-util/e-attachment.c:3559
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
@@ -11645,13 +11582,13 @@ msgstr "Liitettä ei voitu tallentaa"
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 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
+#: ../e-util/e-html-editor-image-dialog.c:510
+#: ../e-util/e-html-editor-link-dialog.c:243
 msgid "_Description:"
 msgstr "K_uvaus:"
 
@@ -11659,7 +11596,7 @@ msgstr "K_uvaus:"
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:696
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
@@ -11671,13 +11608,13 @@ msgstr "Ei voitu asettaa taustakuvaksi"
 msgid "Set as _Background"
 msgstr "Aseta _taustakuvaksi"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "Ladataan"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "Tallennetaan"
 
@@ -11689,112 +11626,75 @@ msgstr "Piilota _liitepalkki"
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:661
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
+#: ../e-util/e-attachment-store.c:668 ../e-util/e-attachment-store.c:670
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../e-util/e-attachment-store.c:538
+#: ../e-util/e-attachment-store.c:717
 msgid "Archive selected directories using this format:"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:631
+#: ../e-util/e-attachment-store.c:821
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
-#: ../e-util/e-attachment-store.c:658
-#| msgid "Could not load the attachment"
+#: ../e-util/e-attachment-store.c:848
 msgid "Do _not extract files from the attachment"
 msgstr "_Älä pura tiedostoja liitteestä"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:853
 msgid "Save extracted files _only"
 msgstr ""
 
-#: ../e-util/e-attachment-store.c:668
+#: ../e-util/e-attachment-store.c:858
 msgid "Save extracted files and the original _archive"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:428
+#: ../e-util/e-attachment-view.c:310
 msgid "Open With Other Application..."
 msgstr "Avaa tois_ella sovelluksella..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:317
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:324
 msgid "Sa_ve As"
 msgstr "_Tallenna nimellä"
 
-#: ../e-util/e-attachment-view.c:451
+#: ../e-util/e-attachment-view.c:333
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Tallenna _nimellä"
 
-#: ../e-util/e-attachment-view.c:461
+#: ../e-util/e-attachment-view.c:343
 msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
-#: ../e-util/e-attachment-view.c:468
+#: ../e-util/e-attachment-view.c:350
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
-msgid "_Hide"
-msgstr "_Piilota"
-
-#: ../e-util/e-attachment-view.c:492
-msgid "Hid_e All"
-msgstr "_Piilota kaikki"
-
-#: ../e-util/e-attachment-view.c:499
-msgid "_View Inline"
-msgstr "Näytä _sisäkkäisesti"
-
-#: ../e-util/e-attachment-view.c:506
-msgid "Vie_w All Inline"
-msgstr "_Näytä kaikki sisäkkäisesti"
-
-#: ../e-util/e-attachment-view.c:513
-msgid "_Zoom to 100%"
-msgstr "_Zoomaa kokoon 100 %"
-
-#: ../e-util/e-attachment-view.c:515
-#, fuzzy
-#| msgid "Reset the text to its original size"
-msgid "Zoom the image to its natural size"
-msgstr "Palauta teksti alkuperäisen kokoiseksi"
-
-#: ../e-util/e-attachment-view.c:520
-#, fuzzy
-#| msgid "Close this window"
-msgid "_Zoom to window"
-msgstr "Sulje tämä ikkuna"
-
-#: ../e-util/e-attachment-view.c:522
-msgid "Zoom large images to not be wider than the window width"
-msgstr ""
-
-#: ../e-util/e-attachment-view.c:880
+#: ../e-util/e-attachment-view.c:660
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Avaa sovelluksella \"%s\""
 
-#: ../e-util/e-attachment-view.c:883
+#: ../e-util/e-attachment-view.c:663
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tämä liite ohjelmalla %s"
@@ -11820,40 +11720,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:207
+#: ../e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Edellinen vuosi"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Seuraava vuosi"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -11956,7 +11856,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:2052
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11967,7 +11867,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:1793
-#: ../modules/itip-formatter/itip-view.c:221
+#: ../modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Tänään"
 
@@ -12156,7 +12056,6 @@ msgid "dark grey"
 msgstr ""
 
 #: ../e-util/e-color-combo.c:99
-#| msgid "3rd"
 msgid "red"
 msgstr "punainen"
 
@@ -12256,9 +12155,9 @@ msgstr ""
 msgid "white"
 msgstr "valkoinen"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4063
 #: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "Oletukset"
@@ -12279,8 +12178,7 @@ msgstr "Paina tästä näyttääksesi kalenterin"
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../e-util/e-dateedit.c:629
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Aika"
 
@@ -12314,7 +12212,7 @@ msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Huomenna"
 
@@ -12637,23 +12535,23 @@ msgstr "Valitse aika johon verrataan"
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-filter-rule.c:761
+#: ../e-util/e-filter-rule.c:765
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../e-util/e-filter-rule.c:811
+#: ../e-util/e-filter-rule.c:815
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../e-util/e-filter-rule.c:812
+#: ../e-util/e-filter-rule.c:816
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../e-util/e-filter-rule.c:818
+#: ../e-util/e-filter-rule.c:822
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:845
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -12661,8 +12559,8 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
-#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
+#: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:139
@@ -12670,997 +12568,950 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../e-util/e-filter-rule.c:857
+#: ../e-util/e-filter-rule.c:861
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../e-util/e-filter-rule.c:859
+#: ../e-util/e-filter-rule.c:863
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../e-util/e-filter-rule.c:860
+#: ../e-util/e-filter-rule.c:864
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../e-util/e-filter-rule.c:867
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../e-util/e-filter-rule.c:942
+#: ../e-util/e-filter-rule.c:946
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
 #: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
+#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: ../e-util/e-html-editor-actions.c:58
+#: ../e-util/e-html-editor-actions.c:82
 #, fuzzy
 #| msgid "Failed to open folder."
 msgid "Failed to insert HTML file."
 msgstr "Kansion avaus epäonnistui."
 
-#: ../e-util/e-html-editor-actions.c:95
+#: ../e-util/e-html-editor-actions.c:120
 #, fuzzy
 #| msgid "Failed to import certificate"
 msgid "Failed to insert text file."
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:321
 msgid "Insert HTML File"
 msgstr "Syötä HTML-tiedosto"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:327
 msgid "HTML file"
 msgstr "HTML-tiedosto"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:354
 #, fuzzy
 #| msgid "Inline Image"
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Sisäkkäiset kuvat"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:412
 #, fuzzy
 #| msgid "Increase the text size"
 msgid "Insert text file"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:418
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: ../e-util/e-html-editor-actions.c:1078
-#| msgid "Copy selected events to the clipboard"
+#: ../e-util/e-html-editor-actions.c:866
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../e-util/e-html-editor-actions.c:1085
-#| msgid "Cut selected events to the clipboard"
+#: ../e-util/e-html-editor-actions.c:873
 msgid "Cut selected text to the clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1092
-#| msgid "Paste events from the clipboard"
+#: ../e-util/e-html-editor-actions.c:880
 msgid "Paste text from the clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:887
 msgid "Redo the last undone action"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:901
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:922
 msgid "For_mat"
-msgstr ""
+msgstr "_Muotoilu"
 
-#: ../e-util/e-html-editor-actions.c:1141
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:929
 #| msgid "Tool_bar Style"
 msgid "_Paragraph Style"
-msgstr "_Työkalupalkin tyyli"
+msgstr "_Kappaleen tyyli"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:943
+#: ../e-util/e-html-editor-image-dialog.c:587
 #| msgid "A_lignment"
 msgid "_Alignment"
 msgstr "_Tasaus"
 
-#: ../e-util/e-html-editor-actions.c:1162
-#| msgid "_Languages"
+#: ../e-util/e-html-editor-actions.c:950
 msgid "Current _Languages"
 msgstr "_Nykyiset kielet"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:967
 msgid "_Increase Indent"
-msgstr ""
+msgstr "_Lisää sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:969
 msgid "Increase Indent"
-msgstr ""
+msgstr "Lisää sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:974
 msgid "_HTML File..."
 msgstr "_HTML-tiedosto..."
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:981
 msgid "Te_xt File..."
 msgstr "Te_kstitiedosto..."
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:988
 msgid "Paste _Quotation"
-msgstr ""
+msgstr "_Liitä lainaus"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:995
 msgid "_Find..."
 msgstr "_Etsi..."
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:997
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1002
 msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1009
 msgid "Re_place..."
 msgstr "_Korvaa..."
 
-#: ../e-util/e-html-editor-actions.c:1223
-#| msgid "Search for text in the displayed contact"
+#: ../e-util/e-html-editor-actions.c:1011
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: ../e-util/e-html-editor-actions.c:1228
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1016
 #| msgid "Canceling..."
 msgid "Check _Spelling..."
-msgstr "Perutaan..."
+msgstr "_Oikolue..."
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1023
 msgid "_Decrease Indent"
-msgstr ""
+msgstr "_Vähennä sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1025
 msgid "Decrease Indent"
-msgstr ""
+msgstr "Vähennä sisennystä"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1030
 msgid "_Wrap Lines"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1249
-msgid "Open Inspector"
-msgstr ""
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1040
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
-msgstr ""
+msgstr "_Keskelle"
 
-#: ../e-util/e-html-editor-actions.c:1261
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1042
 #| msgid "A_lignment"
 msgid "Center Alignment"
-msgstr "_Tasaus"
+msgstr "Tasaus keskelle"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1047
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
-msgstr ""
+msgstr "_Vasemmalle"
 
-#: ../e-util/e-html-editor-actions.c:1268
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1049
 #| msgid "A_lignment"
 msgid "Left Alignment"
-msgstr "_Tasaus"
+msgstr "Tasaus vasemmalle"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1054
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
-msgstr ""
+msgstr "_Oikealle"
 
-#: ../e-util/e-html-editor-actions.c:1275
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1056
 #| msgid "A_lignment"
 msgid "Right Alignment"
-msgstr "_Tasaus"
+msgstr "Tasaus oikealle"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1064
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1066
 msgid "HTML editing mode"
-msgstr ""
+msgstr "HTML-muokkaustila"
 
-#: ../e-util/e-html-editor-actions.c:1290
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1071
 #| msgid "Plain Text"
 msgid "Plain _Text"
-msgstr "Raakateksti"
+msgstr "Raaka_teksti"
 
-#: ../e-util/e-html-editor-actions.c:1292
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1073
 #| msgid "Plain Text Mode"
 msgid "Plain text editing mode"
-msgstr "Raakatekstin tila"
+msgstr "Raakatekstin muokkaustila"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1081
 #, fuzzy
 #| msgid "Normal"
 msgid "_Normal"
 msgstr "Tavallinen"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1088
 msgid "Header _1"
 msgstr "Otsake _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1095
 msgid "Header _2"
 msgstr "Otsake _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1102
 msgid "Header _3"
 msgstr "Otsake _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1109
 msgid "Header _4"
 msgstr "Otsake _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1116
 msgid "Header _5"
 msgstr "Otsake _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1123
 msgid "Header _6"
 msgstr "Otsake _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1130
 msgid "_Preformatted"
-msgstr ""
+msgstr "_Esimuotoiltu"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1137
 msgid "A_ddress"
 msgstr "_Osoite"
 
-#: ../e-util/e-html-editor-actions.c:1363
-msgid "_Blockquote"
-msgstr ""
-
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1144
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Numbered _List"
-msgstr ""
+msgstr "Numeroitu _luetelo"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1165
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1219
 msgid "_Image..."
 msgstr "_Kuva..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1184
 #, fuzzy
 #| msgid "Inline Image"
 msgid "Insert Image"
 msgstr "Sisäkkäiset kuvat"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1189
+#: ../e-util/e-html-editor-actions.c:1226
 msgid "_Link..."
-msgstr ""
+msgstr "_Linkki..."
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1191
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Link"
 msgstr "L_isää"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1241
 #, fuzzy
 #| msgid "_Rename..."
 msgid "_Rule..."
 msgstr "_Nimeä uudestaan..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1200
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Rule"
 msgstr "L_isää"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1248
 #| msgid "_Rename..."
 msgid "_Table..."
-msgstr "_Nimeä uudestaan..."
+msgstr "_Taulukko..."
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1207
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Table"
 msgstr "L_isää"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1212
 msgid "_Cell..."
-msgstr ""
+msgstr "_Solu..."
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1233
 #, fuzzy
 #| msgid "Save _Image..."
 msgid "Pa_ge..."
 msgstr "Tal_lenna kuva..."
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1257
 msgid "Font _Size"
 msgstr "Fontin _koko"
 
-#: ../e-util/e-html-editor-actions.c:1490
-#| msgid "_Forward style:"
+#: ../e-util/e-html-editor-actions.c:1264
 msgid "_Font Style"
 msgstr "_Fontin tyyli"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1271
 msgid "Paste As _Text"
 msgstr "Liitä _tekstinä"
 
-#: ../e-util/e-html-editor-actions.c:1508
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-text-dialog.c:203
 msgid "_Bold"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Bold"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1516
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Italic"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1298
 #, fuzzy
 #| msgid "Plain Text"
 msgid "_Plain Text"
 msgstr "Raakateksti"
 
-#: ../e-util/e-html-editor-actions.c:1532
-#: ../e-util/e-html-editor-text-dialog.c:246
+#: ../e-util/e-html-editor-actions.c:1306
+#: ../e-util/e-html-editor-text-dialog.c:235
 msgid "_Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Strikethrough"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1540
-#: ../e-util/e-html-editor-text-dialog.c:236
+#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-text-dialog.c:225
 #, fuzzy
 #| msgid "Undefined"
 msgid "_Underline"
 msgstr "Määrittämätön"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1316
 #, fuzzy
 #| msgid "Undefined"
 msgid "Underline"
 msgstr "Määrittämätön"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1326
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1568
+#: ../e-util/e-html-editor-actions.c:1342
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1576
+#: ../e-util/e-html-editor-actions.c:1350
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1584
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1592
+#: ../e-util/e-html-editor-actions.c:1366
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1393
 #, fuzzy
 #| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "_Sisältö"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1400
 #, fuzzy
 #| msgid "Add a Column"
 msgid "Column"
 msgstr "Lisää sarake"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1407
 #, fuzzy
 #| msgid "Low"
 msgid "Row"
 msgstr "Matala"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1414
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table"
 msgstr "Taulukon solu"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1424
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Delete"
 msgstr "Taulukon solu"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
-msgid "Input Methods"
-msgstr "Syötemenetelmät"
-
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1665
+#: ../e-util/e-html-editor-actions.c:1432
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Insert"
 msgstr "Taulukon solu"
 
-#: ../e-util/e-html-editor-actions.c:1672
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-actions.c:1439
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1457
 msgid "Column After"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "Column Before"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1471
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert _Link"
 msgstr "L_isää"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1478
 msgid "Row Above"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1485
 msgid "Row Below"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "Cell..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1499
 msgid "Image..."
 msgstr "Kuva..."
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Link..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1753
-#| msgid "Pager"
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "Page..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paragraph..."
 msgstr ""
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1528
 #, fuzzy
 #| msgid "Full _Name..."
 msgid "Rule..."
 msgstr "_Koko nimi..."
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1535
 msgid "Table..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1782
-#| msgid "Select..."
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "Text..."
 msgstr "Text..."
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Remove Link"
 msgstr "Poista linkki"
 
-#: ../e-util/e-html-editor-actions.c:1806
-#| msgid "Add \"%s\" to Dictionary"
+#: ../e-util/e-html-editor-actions.c:1566
 msgid "Add Word to Dictionary"
 msgstr "Lisää sana sanastoon"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1573
 #, fuzzy
 #| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1580
 msgid "Add Word To"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1829
-#| msgid "(no suggestions)"
+#: ../e-util/e-html-editor-actions.c:1589
 msgid "More Suggestions"
 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:1950
+#: ../e-util/e-html-editor-actions.c:1713
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
-#: ../e-util/e-html-editor-actions.c:2040
+#: ../e-util/e-html-editor-actions.c:1792
 msgid "_Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:2041
+#: ../e-util/e-html-editor-actions.c:1793
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Insert Emoticon"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:1861
 msgid "Re_place"
 msgstr "_Korvaa"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:1864
 msgid "_Image"
 msgstr "_Kuva"
 
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:1867
 msgid "_Link"
 msgstr ""
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2119
+#: ../e-util/e-html-editor-actions.c:1871
 #, fuzzy
 #| msgid "Add Rule"
 msgid "_Rule"
 msgstr "Lisää sääntö"
 
-#: ../e-util/e-html-editor-actions.c:2122
-#: ../e-util/e-html-editor-cell-dialog.c:738
+#: ../e-util/e-html-editor-actions.c:1874
+#: ../e-util/e-html-editor-cell-dialog.c:450
 #, fuzzy
 #| msgid "E_nable"
 msgid "_Table"
 msgstr "Kä_ytä"
 
-#: ../e-util/e-html-editor.c:704
+#: ../e-util/e-html-editor.c:689
 msgid "Paragraph Style"
 msgstr ""
 
-#: ../e-util/e-html-editor.c:718
-#| msgid "Edit Reminder"
+#: ../e-util/e-html-editor.c:703
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../e-util/e-html-editor.c:730
+#: ../e-util/e-html-editor.c:715
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../e-util/e-html-editor.c:748
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Fontin koko"
 
-#: ../e-util/e-html-editor-cell-dialog.c:698
+#: ../e-util/e-html-editor-cell-dialog.c:410
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-cell-dialog.c:424
 msgid "C_ell"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:725
+#: ../e-util/e-html-editor-cell-dialog.c:437
 msgid "_Row"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:751
+#: ../e-util/e-html-editor-cell-dialog.c:463
 msgid "Col_umn"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:473
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:774
-#: ../e-util/e-html-editor-hrule-dialog.c:413
-#: ../e-util/e-html-editor-table-dialog.c:900
+#: ../e-util/e-html-editor-cell-dialog.c:486
+#: ../e-util/e-html-editor-hrule-dialog.c:330
+#: ../e-util/e-html-editor-table-dialog.c:651
 msgid "Left"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:775
-#: ../e-util/e-html-editor-hrule-dialog.c:415
-#: ../e-util/e-html-editor-table-dialog.c:901
+#: ../e-util/e-html-editor-cell-dialog.c:487
+#: ../e-util/e-html-editor-hrule-dialog.c:332
+#: ../e-util/e-html-editor-table-dialog.c:652
 msgid "Center"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:776
-#: ../e-util/e-html-editor-hrule-dialog.c:417
-#: ../e-util/e-html-editor-table-dialog.c:902
+#: ../e-util/e-html-editor-cell-dialog.c:488
+#: ../e-util/e-html-editor-hrule-dialog.c:334
+#: ../e-util/e-html-editor-table-dialog.c:653
 msgid "Right"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:784
+#: ../e-util/e-html-editor-cell-dialog.c:496
 msgid "_Horizontal:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-cell-dialog.c:504
+#: ../e-util/e-html-editor-image-dialog.c:577
 #, fuzzy
 #| msgid "_Top"
 msgid "Top"
 msgstr "Ylimm_äiseksi"
 
-#: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-cell-dialog.c:505
+#: ../e-util/e-html-editor-image-dialog.c:578
 #, fuzzy
 #| msgid "_Middle:"
 msgid "Middle"
 msgstr "_Toinen nimi:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-cell-dialog.c:506
+#: ../e-util/e-html-editor-image-dialog.c:579
 #, fuzzy
 #| msgid "_Bottom"
 msgid "Bottom"
 msgstr "Ali_mmaiseksi"
 
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:514
 #, fuzzy
 #| msgid "_Vertical View"
 msgid "_Vertical:"
 msgstr "_Pystysuuntainen näkymä"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:808
+#: ../e-util/e-html-editor-cell-dialog.c:520
 #, fuzzy
 #| msgid "Plain Text"
 msgid "_Wrap Text"
 msgstr "Raakateksti"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:816
+#: ../e-util/e-html-editor-cell-dialog.c:528
 msgid "_Header Style"
 msgstr "_Otsaketyyli"
 
-#: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
-#: ../e-util/e-html-editor-table-dialog.c:812
+#: ../e-util/e-html-editor-cell-dialog.c:542
+#: ../e-util/e-html-editor-image-dialog.c:517
+#: ../e-util/e-html-editor-table-dialog.c:563
 msgid "<b>Layout</b>"
 msgstr "<b>Asettelu</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:841
+#: ../e-util/e-html-editor-cell-dialog.c:553
 msgid "_Width"
 msgstr "_Leveys"
 
-#: ../e-util/e-html-editor-cell-dialog.c:880
+#: ../e-util/e-html-editor-cell-dialog.c:593
 msgid "Row S_pan:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:894
+#: ../e-util/e-html-editor-cell-dialog.c:607
 msgid "Co_lumn Span:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:901
-#: ../e-util/e-html-editor-table-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:614
+#: ../e-util/e-html-editor-table-dialog.c:667
 msgid "<b>Background</b>"
 msgstr "<b>Tausta</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:914
-#: ../e-util/e-html-editor-table-dialog.c:929
+#: ../e-util/e-html-editor-cell-dialog.c:627
+#: ../e-util/e-html-editor-table-dialog.c:680
 msgid "Transparent"
-msgstr ""
+msgstr "Läpinäkyvä"
 
-#: ../e-util/e-html-editor-cell-dialog.c:922
+#: ../e-util/e-html-editor-cell-dialog.c:635
 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
+#: ../e-util/e-html-editor-cell-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:479
+#: ../e-util/e-html-editor-table-dialog.c:696
 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
-#| msgid "Image"
+#: ../e-util/e-html-editor-cell-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:485
+#: ../e-util/e-html-editor-table-dialog.c:701
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../e-util/e-html-editor-cell-dialog.c:948
+#: ../e-util/e-html-editor-cell-dialog.c:661
 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
-#| msgid "_No image"
+#: ../e-util/e-html-editor-cell-dialog.c:668
+#: ../e-util/e-html-editor-page-dialog.c:497
+#: ../e-util/e-html-editor-table-dialog.c:721
 msgid "_Remove image"
 msgstr "_Poista kuva"
 
-#: ../e-util/e-html-editor-cell-dialog.c:975
+#: ../e-util/e-html-editor-cell-dialog.c:688
 #, fuzzy
 #| msgid "_Properties"
 msgid "Cell Properties"
 msgstr "_Ominaisuudet"
 
-#: ../e-util/e-html-editor-find-dialog.c:105
-#: ../e-util/e-html-editor-replace-dialog.c:90
-#: ../e-util/e-html-editor-replace-dialog.c:108
+#: ../e-util/e-html-editor-find-dialog.c:94
+#: ../e-util/e-html-editor-replace-dialog.c:70
 msgid "No match found"
 msgstr ""
 
-#: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:247
-#| msgid "Search _Folders"
+#: ../e-util/e-html-editor-find-dialog.c:217
+#: ../e-util/e-html-editor-replace-dialog.c:297
 msgid "Search _backwards"
 msgstr "Etsi _taaksepäin"
 
-#: ../e-util/e-html-editor-find-dialog.c:167
+#: ../e-util/e-html-editor-find-dialog.c:224
 msgid "Case _Sensitive"
 msgstr "_Huomioi kirjainkoko"
 
-#: ../e-util/e-html-editor-find-dialog.c:174
+#: ../e-util/e-html-editor-find-dialog.c:231
 #, fuzzy
 #| msgid "_Search"
 msgid "_Wrap Search"
 msgstr "Et_si"
 
-#: ../e-util/e-html-editor-find-dialog.c:213
+#: ../e-util/e-html-editor-find-dialog.c:270
 msgid "Find"
 msgstr "Etsi"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:348
+#: ../e-util/e-html-editor-hrule-dialog.c:265
 msgid "<b>Size</b>"
 msgstr "<b>Koko</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
-#: ../e-util/e-html-editor-table-dialog.c:823
+#: ../e-util/e-html-editor-hrule-dialog.c:285
+#: ../e-util/e-html-editor-image-dialog.c:535
+#: ../e-util/e-html-editor-table-dialog.c:574
 msgid "_Width:"
 msgstr "_Leveys:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:393
+#: ../e-util/e-html-editor-hrule-dialog.c:310
 msgid "_Size:"
 msgstr "_Koko:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:400
+#: ../e-util/e-html-editor-hrule-dialog.c:317
 msgid "<b>Style</b>"
 msgstr "<b>Tyyli</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:425
-#: ../e-util/e-html-editor-table-dialog.c:909
-#, fuzzy
+#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-table-dialog.c:660
 #| msgid "A_lignment"
 msgid "_Alignment:"
-msgstr "_Tasaus"
+msgstr "_Tasaus:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:431
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "S_haded"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:448
+#: ../e-util/e-html-editor-hrule-dialog.c:365
 #, fuzzy
 #| msgid "Folder Properties"
 msgid "Rule properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:467
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:766
+#: ../e-util/e-html-editor-table-dialog.c:517
 msgid "<b>General</b>"
 msgstr "<b>Yleiset</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:496
 msgid "_Source:"
 msgstr "_Lähde:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:559
 msgid "_Height:"
 msgstr "_Korkeus:"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:600
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:616
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:680
-#: ../e-util/e-html-editor-table-dialog.c:890
+#: ../e-util/e-html-editor-image-dialog.c:632
+#: ../e-util/e-html-editor-table-dialog.c:641
 msgid "_Border:"
 msgstr "_Reunus:"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:642
 msgid "<b>Link</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:708
-#: ../e-util/e-html-editor-link-dialog.c:400
+#: ../e-util/e-html-editor-image-dialog.c:660
+#: ../e-util/e-html-editor-link-dialog.c:221
 #, fuzzy
 #| msgid "URL:"
 msgid "_URL:"
 msgstr "URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
-#: ../e-util/e-html-editor-link-dialog.c:405
+#: ../e-util/e-html-editor-image-dialog.c:665
+#: ../e-util/e-html-editor-link-dialog.c:226
 msgid "_Test URL..."
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:730
-#| msgid "Category Properties"
+#: ../e-util/e-html-editor-image-dialog.c:682
 msgid "Image Properties"
 msgstr "Kuvan ominaisuudet"
 
-#: ../e-util/e-html-editor-link-dialog.c:429
-#| msgid "_Remove"
+#: ../e-util/e-html-editor-link-dialog.c:250
 msgid "_Remove Link"
 msgstr "_Poista linkki"
 
-#: ../e-util/e-html-editor-link-dialog.c:454
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-link-dialog.c:275
 msgid "Link Properties"
 msgstr "Linkin ominaisuudet"
 
-#: ../e-util/e-html-editor-page-dialog.c:72
+#: ../e-util/e-html-editor-page-dialog.c:70
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:81
+#: ../e-util/e-html-editor-page-dialog.c:79
 msgid "Blue Ink"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:90
+#: ../e-util/e-html-editor-page-dialog.c:88
 msgid "Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:99
+#: ../e-util/e-html-editor-page-dialog.c:97
 msgid "Ribbon"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:108
+#: ../e-util/e-html-editor-page-dialog.c:106
 msgid "Midnight"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:124 ../mail/filtertypes.xml.in.h:38
 #: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../e-util/e-html-editor-page-dialog.c:135
+#: ../e-util/e-html-editor-page-dialog.c:133
 msgid "Graph Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:544
+#: ../e-util/e-html-editor-page-dialog.c:381
 msgid "<b>Colors</b>"
 msgstr "<b>Värit</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:563
-#| msgid "_Text Only"
+#: ../e-util/e-html-editor-page-dialog.c:400
 msgid "_Text:"
 msgstr "_Teksti:"
 
-#: ../e-util/e-html-editor-page-dialog.c:578
+#: ../e-util/e-html-editor-page-dialog.c:415
 msgid "_Link:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:593
+#: ../e-util/e-html-editor-page-dialog.c:430
 msgid "_Visited Link:"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:608
-#| msgid "Set as _Background"
+#: ../e-util/e-html-editor-page-dialog.c:445
 msgid "_Background:"
 msgstr "_Tausta:"
 
-#: ../e-util/e-html-editor-page-dialog.c:616
+#: ../e-util/e-html-editor-page-dialog.c:453
 msgid "<b>Background Image</b>"
 msgstr "<b>Taustakuva</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../e-util/e-html-editor-page-dialog.c:475
 #: ../modules/calendar/e-calendar-preferences.ui.h:80
 #, fuzzy
 #| msgid "Template:"
 msgid "_Template:"
 msgstr "Pohja:"
 
-#: ../e-util/e-html-editor-page-dialog.c:646
-#: ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-html-editor-page-dialog.c:653
+#: ../e-util/e-html-editor-page-dialog.c:490
 #, fuzzy
 #| msgid "_Custom"
 msgid "_Custom:"
 msgstr "_Oma"
 
-#: ../e-util/e-html-editor-page-dialog.c:680
-#, fuzzy
+#: ../e-util/e-html-editor-page-dialog.c:517
 #| msgid "_Properties"
 msgid "Page Properties"
-msgstr "_Ominaisuudet"
+msgstr "Sivun ominaisuudet"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:83
-#| msgid "_Reply style:"
 msgid "_Style:"
 msgstr "_Tyyli:"
 
@@ -13671,195 +13522,177 @@ msgid "<b>Alignment</b>"
 msgstr "_Tasaus"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:155
-#, fuzzy
 #| msgid "Category Properties"
 msgid "Paragraph Properties"
-msgstr "Luokan ominaisuudet"
+msgstr "Kappaleen ominaisuudet"
 
-#: ../e-util/e-html-editor-replace-dialog.c:163
+#: ../e-util/e-html-editor-replace-dialog.c:92
 #, c-format
-#| msgid "occurrences"
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
 msgstr[0] "%d ilmentymä korvattu"
 msgstr[1] "%d ilmentymää korvattu"
 
-#: ../e-util/e-html-editor-replace-dialog.c:227
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-replace-dialog.c:280
 msgid "R_eplace:"
 msgstr "_Korvaa:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:239
+#: ../e-util/e-html-editor-replace-dialog.c:289
 msgid "_With:"
 msgstr ""
 
-#: ../e-util/e-html-editor-replace-dialog.c:251
+#: ../e-util/e-html-editor-replace-dialog.c:301
 msgid "_Case sensitive"
-msgstr ""
+msgstr "_Huomioi kirjainkoko"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-html-editor-replace-dialog.c:305
 #, fuzzy
 #| msgid "_Search"
 msgid "Wra_p search"
 msgstr "Et_si"
 
-#: ../e-util/e-html-editor-replace-dialog.c:265
+#: ../e-util/e-html-editor-replace-dialog.c:315
 msgid "_Skip"
 msgstr "_Ohita"
 
-#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-html-editor-replace-dialog.c:323
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../e-util/e-html-editor-replace-dialog.c:281
+#: ../e-util/e-html-editor-replace-dialog.c:331
 msgid "Replace _All"
 msgstr "Ko_rvaa kaikki"
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-replace-dialog.c:351
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#: ../e-util/e-html-editor-spell-check-dialog.c:85
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:390
 msgid "<b>Suggestions</b>"
-msgstr ""
+msgstr "<b>Ehdotukset</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:425
 msgid "Replace"
 msgstr "Korvaa"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:434
 msgid "Replace All"
 msgstr "Korvaa kaikki"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:110
+#: ../e-util/e-html-editor-spell-check-dialog.c:443
+#: ../mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:452
 msgid "Skip"
 msgstr "Ohita"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:461
 #, fuzzy
 #| msgid "Go Back"
 msgid "Back"
 msgstr "Siirry takaisin"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:470
 msgid "<b>Dictionary</b>"
-msgstr ""
+msgstr "<b>Sanasto</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
-#| msgid "Add Folder"
+#: ../e-util/e-html-editor-spell-check-dialog.c:490
 msgid "Add word"
 msgstr "Lisää sana"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637
-#: ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../e-util/e-html-editor-table-dialog.c:788
+#: ../e-util/e-html-editor-table-dialog.c:539
 msgid "_Rows:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:805
+#: ../e-util/e-html-editor-table-dialog.c:556
 #, fuzzy
 #| msgid "_Table column:"
 msgid "C_olumns:"
 msgstr "_Taulukon sarake:"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:607
 msgid "_Spacing:"
 msgstr ""
 
-#: ../e-util/e-html-editor-table-dialog.c:873
+#: ../e-util/e-html-editor-table-dialog.c:624
 #, fuzzy
 #| msgid "Loading"
 msgid "_Padding:"
 msgstr "Ladataan"
 
-#: ../e-util/e-html-editor-table-dialog.c:937
-#: ../e-util/e-html-editor-text-dialog.c:261
+#: ../e-util/e-html-editor-table-dialog.c:688
+#: ../e-util/e-html-editor-text-dialog.c:250
 msgid "_Color:"
 msgstr "_Väri:"
 
-#: ../e-util/e-html-editor-table-dialog.c:963
+#: ../e-util/e-html-editor-table-dialog.c:714
 msgid "Image:"
 msgstr "Kuva:"
 
-#: ../e-util/e-html-editor-table-dialog.c:990
+#: ../e-util/e-html-editor-table-dialog.c:741
 msgid "Table Properties"
 msgstr "Taulukon ominaisuudet"
 
-#: ../e-util/e-html-editor-text-dialog.c:281
+#: ../e-util/e-html-editor-text-dialog.c:270
 msgid "Si_ze:"
 msgstr "_Koko:"
 
-#: ../e-util/e-html-editor-text-dialog.c:296
+#: ../e-util/e-html-editor-text-dialog.c:285
 msgid "Text Properties"
 msgstr "Tekstin ominaisuudet"
 
-#: ../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:6382
-#, fuzzy
-#| msgid "Whether to show the preview pane."
-msgid "Whether editor changed"
-msgstr "Näytetäänkö esikatselupaneeli."
-
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../e-util/e-import-assistant.c:533
+#: ../e-util/e-import-assistant.c:538
 #, fuzzy
 #| msgid ""
 #| "Evolution checked for settings to import from the following applications: "
@@ -13874,40 +13707,40 @@ msgstr ""
 "Elm, iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla "
 "uudestaan, napsauta ”Takaisin”-painiketta."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
+#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
+#: ../e-util/e-import-assistant.c:1381
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../e-util/e-import-assistant.c:938
 msgid "Select what type of file you want to import from the list."
 msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13917,19 +13750,19 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
 "Evolutionin käyttöön."
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-import-assistant.c:1359
+#: ../e-util/e-import-assistant.c:1367
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 
@@ -13937,35 +13770,35 @@ msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Sulje"
 
-#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../e-util/e-mail-signature-editor.c:533
+#: ../e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../e-util/e-mail-signature-editor.c:566
+#: ../e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../e-util/e-mail-signature-editor.c:602
+#: ../e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../e-util/e-mail-signature-manager.c:426
+#: ../e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../e-util/e-mail-signature-manager.c:497
+#: ../e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Muokkaa allekirjoitus-skriptiä"
 
@@ -13999,35 +13832,35 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
-#: ../e-util/e-misc-utils.c:251
+#: ../e-util/e-misc-utils.c:255
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../e-util/e-misc-utils.c:334
+#: ../e-util/e-misc-utils.c:338
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2503
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Avataan kalenteria %s"
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2506
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2509
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2512
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Avataan osoitekirja '%s'"
 
-#: ../e-util/e-misc-utils.c:3138
+#: ../e-util/e-misc-utils.c:3290
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
@@ -14065,8 +13898,7 @@ msgstr "_Yhteystiedot"
 msgid "Search"
 msgstr "Etsi"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:429
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Osoitekirja"
 
@@ -14199,10 +14031,9 @@ msgid "Configuration _URL:"
 msgstr "_Määritysosoite:"
 
 #: ../e-util/e-proxy-editor.c:560
-#, fuzzy
 #| msgid "_Custom binary:"
 msgid "No proxy"
-msgstr "_Omavalintainen binääri:"
+msgstr "Ei välityspalvelinta"
 
 #: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
@@ -14210,11 +14041,11 @@ msgstr "Käytä suoraa yhteyttä, välityspalvelinta ei tarvita."
 
 #: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
-msgstr ""
+msgstr "Siirry välityspalvelimen perusasetuksiin"
 
 #: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
-msgstr ""
+msgstr "Siirry välityspalvelimen edistyneisiin asetuksiin"
 
 #: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
@@ -14227,10 +14058,9 @@ msgid ""
 msgstr ""
 
 #: ../e-util/e-proxy-selector.c:85
-#, fuzzy
 #| msgid "_Custom binary:"
 msgid "Custom Proxy"
-msgstr "_Omavalintainen binääri:"
+msgstr "Omavalintainen välityspalvelin"
 
 #: ../e-util/e-proxy-selector.c:487
 msgid "Create a new proxy profile"
@@ -14248,48 +14078,48 @@ msgstr "Lisää sääntö"
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../e-util/e-search-bar.c:83
+#: ../e-util/e-search-bar.c:84
 #, c-format
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:611
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:619
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:631
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:655
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:667
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:679
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:707
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:729
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
@@ -14445,7 +14275,6 @@ 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ä"
 
@@ -14470,27 +14299,26 @@ 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 ../mail/e-mail-display.c:742
+msgid "_Hide"
+msgstr "_Piilota"
+
 #: ../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:"
 
@@ -14572,7 +14400,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:62
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Ilmoitettu virhe oli &quot;{1}&quot;."
 
@@ -14744,11 +14572,11 @@ msgstr "Tyhjennä k_aikki"
 msgid "_Show field in View"
 msgstr "_Näytä kenttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -14810,60 +14638,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../e-util/e-table-header-item.c:1619
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "Poista _järjestys"
+#: ../e-util/e-table-header-item.c:1648
+msgid "_Reset sort"
+msgstr "_Palauta järjestys"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn..."
 msgstr "Lisää _sarake..."
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1671
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1675
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistä näkymää..."
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1746
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1769
 msgid "_Custom"
 msgstr "_Oma"
 
@@ -14871,10 +14699,14 @@ msgstr "_Oma"
 msgid "Select All"
 msgstr "Valitse kaikki"
 
+#: ../e-util/e-text.c:2147
+msgid "Input Methods"
+msgstr "Syötemenetelmät"
+
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
-#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
-#: ../e-util/e-timezone-dialog.c:804
+#: ../e-util/e-timezone-dialog.c:270 ../e-util/e-timezone-dialog.c:510
+#: ../e-util/e-timezone-dialog.c:514 ../e-util/e-timezone-dialog.c:518
+#: ../e-util/e-timezone-dialog.c:901
 msgid "UTC"
 msgstr "UTC"
 
@@ -14932,101 +14764,106 @@ msgid "Flags"
 msgstr "_Merkki:"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:760
+#: ../mail/e-mail-config-identity-page.c:779
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:337
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../e-util/e-web-view.c:320
+#: ../e-util/e-web-view.c:339
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:347
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view.c:330
+#: ../e-util/e-web-view.c:349
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:357
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:364
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../e-util/e-web-view.c:347
+#: ../e-util/e-web-view.c:366
 #, 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:362
+#: ../e-util/e-web-view.c:381
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../e-util/e-web-view.c:364
+#: ../e-util/e-web-view.c:383
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:388
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../e-util/e-web-view.c:371
+#: ../e-util/e-web-view.c:390
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
+#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1826
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../e-util/e-web-view.c:1074
+#: ../e-util/e-web-view.c:1284
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../e-util/e-web-view.c:1076
+#: ../e-util/e-web-view.c:1286
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../e-util/e-web-view.c:1087
+#: ../e-util/e-web-view.c:1297
 #, 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:1089
+#: ../e-util/e-web-view.c:1299
 #, 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:1093
+#: ../e-util/e-web-view.c:1303
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3672
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3860
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3896
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Tallennetaan kuva kohteeseen \"%s\""
 
+#: ../e-util/e-web-view.c:3991
+#, c-format
+msgid "Cannot get URI '%s', do not know how to download it."
+msgstr ""
+
 #: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr ""
@@ -15072,7 +14909,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:101
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -15105,14 +14942,13 @@ 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}\"?"
+msgstr "Haluatko varmasti poistaa säännön \"{0}\"?"
 
 #: ../e-util/filter.error.xml.h:17
 msgid "_Keep"
-msgstr ""
+msgstr "_Säilytä"
 
 #: ../e-util/filter.ui.h:2
 msgid "the current time"
@@ -15134,8 +14970,7 @@ msgstr "sekuntia"
 msgid "weeks"
 msgstr "viikkoa"
 
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "kuukautta"
 
@@ -15207,12 +15042,12 @@ msgid "toggle the cell"
 msgstr "Vaihtele solun näkyvyyttä"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tämän solun sisältävä ETreen rivi"
 
@@ -15236,7 +15071,7 @@ msgstr "Luo uusi _näkymä"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
@@ -15244,7 +15079,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 ../mail/mail.error.xml.h:197
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
@@ -15293,7 +15128,6 @@ msgstr ""
 "Exchange -palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
 
 #: ../libemail-engine/camel-sasl-oauth2-google.c:29
-#| msgid "OAuth2"
 msgid "OAuth2 Google"
 msgstr "OAuth2 Google"
 
@@ -15321,92 +15155,91 @@ msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:935
+#: ../libemail-engine/e-mail-folder-utils.c:946
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:778
+#: ../libemail-engine/e-mail-folder-utils.c:786
 msgid "Scanning messages for duplicates"
 msgstr "Etsitään kaksoiskappaleita viesteistä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1148
+#: ../libemail-engine/e-mail-folder-utils.c:1159
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Poistetaan kansiota ”%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1328
+#: ../libemail-engine/e-mail-folder-utils.c:1340
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Tiedosto \"%s\" on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1344
 msgid "File has been removed."
 msgstr "Tiedosto on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1391
+#: ../libemail-engine/e-mail-folder-utils.c:1421
 msgid "Removing attachments"
 msgstr "Poistetaan liitteitä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1555
+#: ../libemail-engine/e-mail-folder-utils.c:1593
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1933
+#: ../libemail-engine/e-mail-folder-utils.c:1971
 #, fuzzy, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
-#: ../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:1052
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
+#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1056
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../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:1262
+#: ../libemail-engine/e-mail-session.c:1305
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1362
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been "
@@ -15416,13 +15249,13 @@ msgid ""
 "cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1375
 #, 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:2362
+#: ../libemail-engine/e-mail-session.c:2405
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for '%s'"
@@ -15435,28 +15268,28 @@ msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:719
+#: ../libemail-engine/mail-ops.c:720
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Posting message to '%s'"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
 #: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:756
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:697
 #: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Storing sent message to '%s'"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
 #: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:803
+#: ../libemail-engine/mail-ops.c:804
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15466,13 +15299,13 @@ msgstr ""
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
 #: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:831
+#: ../libemail-engine/mail-ops.c:832
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
@@ -15509,7 +15342,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Noudetaan viestejä kohteesta '%s'"
 
-#: ../libemail-engine/mail-ops.c:749
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -15518,57 +15351,58 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:990
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1058
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Viestin lähetys epäonnistui"
 msgstr[1] "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../libemail-engine/mail-ops.c:1048
-msgid "Canceled."
+#: ../libemail-engine/mail-ops.c:1064
+#| msgid "Cancelled"
+msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../libemail-engine/mail-ops.c:1050
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1165
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1488
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1580
+#: ../libemail-engine/mail-ops.c:1598
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Processing folder changes in '%s'"
@@ -15636,7 +15470,7 @@ msgstr "Tämä tili luotiin verkkotilipalvelun kautta."
 
 #: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
-msgstr ""
+msgstr "_Palauta järjestys"
 
 #: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
@@ -15649,7 +15483,7 @@ msgid "De_fault"
 msgstr "_Oletustili"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1282
+#: ../modules/mail/em-composer-prefs.c:1281
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -15672,7 +15506,7 @@ msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../mail/e-mail-browser.c:288
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -15690,7 +15524,7 @@ msgstr "_Ohita haku"
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../mail/e-mail-config-assistant.c:952
+#: ../mail/e-mail-config-assistant.c:954
 msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
@@ -15722,145 +15556,155 @@ msgstr ""
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/e-mail-config-defaults-page.c:371
+#: ../mail/e-mail-config-defaults-page.c:377
 msgid "Checking server settings..."
 msgstr "Tarkistetaan palvelimen asetuksia..."
 
-#: ../mail/e-mail-config-defaults-page.c:489
+#: ../mail/e-mail-config-defaults-page.c:495
 #, 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
+#: ../mail/e-mail-config-defaults-page.c:497 ../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
+#: ../mail/e-mail-config-defaults-page.c:499 ../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
+#: ../mail/e-mail-config-defaults-page.c:501 ../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
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Älä lainaa"
 
-#: ../mail/e-mail-config-defaults-page.c:822
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: ../mail/e-mail-config-defaults-page.c:831
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "Luonnosviestin _kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:841
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "Valitse tallennuskansio luonnosviesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:865
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "Valitse tallennuskansio lähetetyille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:884
+#: ../mail/e-mail-config-defaults-page.c:891
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:901
-#, fuzzy
+#: ../mail/e-mail-config-defaults-page.c:908
 #| msgid "Search Folders"
 msgid "Archi_ve Folder:"
-msgstr "Hakunäkymät"
+msgstr "A_rkistointikansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:911
+#: ../mail/e-mail-config-defaults-page.c:918
 #: ../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:"
+msgstr "Valitse kansio johon viesti arkistoidaan."
 
-#: ../mail/e-mail-config-defaults-page.c:929
+#: ../mail/e-mail-config-defaults-page.c:932
+#, fuzzy
+#| msgid "Template:"
+msgid "_Templates Folder:"
+msgstr "Pohja:"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+#, fuzzy
+#| msgid "Choose a folder for deleted messages."
+msgid "Choose a folder to use for template messages."
+msgstr "Valitse kansio poistetuille viesteille."
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "_Restore Defaults"
 msgstr "_Palauta oletukset"
 
-#: ../mail/e-mail-config-defaults-page.c:946
+#: ../mail/e-mail-config-defaults-page.c:981
 #, fuzzy
 #| msgid "Go to Folder"
 msgid "_Lookup Folders"
 msgstr "Siirry kansioon"
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:965
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:974
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:975
+#: ../mail/e-mail-config-defaults-page.c:1010
 #, 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:992
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "Viestien kirjoittaminen"
 
-#: ../mail/e-mail-config-defaults-page.c:1001
+#: ../mail/e-mail-config-defaults-page.c:1036
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:1026
+#: ../mail/e-mail-config-defaults-page.c:1061
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:1057
+#: ../mail/e-mail-config-defaults-page.c:1092
 #, fuzzy
 #| msgid "_Reply style:"
 msgid "Re_ply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/e-mail-config-defaults-page.c:1093
+#: ../mail/e-mail-config-defaults-page.c:1128
 msgid "Message Receipts"
 msgstr "Viestin kuittaukset"
 
-#: ../mail/e-mail-config-defaults-page.c:1102
+#: ../mail/e-mail-config-defaults-page.c:1137
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/e-mail-config-defaults-page.c:1127
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/e-mail-config-defaults-page.c:1133
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/e-mail-config-defaults-page.c:1139
+#: ../mail/e-mail-config-defaults-page.c:1174
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/e-mail-config-defaults-page.c:1246
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
-#: ../mail/e-mail-config-identity-page.c:286
+#: ../mail/e-mail-config-identity-page.c:304
 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 "
@@ -15870,14 +15714,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:314
+#: ../mail/e-mail-config-identity-page.c:332
 #: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-identity-page.c:370
 #: ../mail/e-mail-config-summary-page.c:353
-#, fuzzy
 #| msgid ""
 #| "Type the name by which you would like to refer to this account.\n"
 #| "For example, \"Work\" or \"Personal\"."
@@ -15885,63 +15728,63 @@ msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
 msgstr ""
-"Anna nimi, jolla haluat kutsua tätä sähköpostitiliä.\n"
+"Yllä olevaa nimeä käytetään tilin yksilöintiin.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtainen\""
 
-#: ../mail/e-mail-config-identity-page.c:369
+#: ../mail/e-mail-config-identity-page.c:387
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:378
+#: ../mail/e-mail-config-identity-page.c:396
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/e-mail-config-identity-page.c:407
+#: ../mail/e-mail-config-identity-page.c:425
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:474
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:465
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/e-mail-config-identity-page.c:494
+#: ../mail/e-mail-config-identity-page.c:512
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/e-mail-config-identity-page.c:549
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/e-mail-config-identity-page.c:567
+#: ../mail/e-mail-config-identity-page.c:585
 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"
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../mail/e-mail-config-identity-page.c:630
+#| msgid "Full Name cannot be empty"
+msgid "Full Name should not 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."
+#: ../mail/e-mail-config-identity-page.c:637
 msgid "Email Address cannot be empty"
 msgstr "Sähköpostiosoite ei voi olla tyhjä"
 
-#: ../mail/e-mail-config-identity-page.c:623
+#: ../mail/e-mail-config-identity-page.c:642
 msgid "Email Address is not a valid email"
-msgstr ""
+msgstr "Sähköpostiosoite ei ole kelvollinen osoite"
 
-#: ../mail/e-mail-config-identity-page.c:635
+#: ../mail/e-mail-config-identity-page.c:654
 msgid "Reply To is not a valid email"
-msgstr ""
+msgstr "Vastausosoite ei ole kelvollinen osoite"
 
-#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-identity-page.c:665
 #: ../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ä"
 
@@ -15973,11 +15816,12 @@ 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:31
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/mail/e-mail-shell-backend.c:731
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Yleiset"
@@ -16147,10 +15991,6 @@ msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
 #: ../mail/e-mail-config-welcome-page.c:156
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Continue\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -16169,30 +16009,62 @@ msgstr "Tervetuloa"
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:124
 msgid "_Add to Address Book..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:131
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:138
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:145
 msgid "Send _Reply To..."
 msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:147
 msgid "Send a reply message to this address"
 msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:154
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
+#: ../mail/e-mail-display.c:749
+msgid "Hid_e All"
+msgstr "_Piilota kaikki"
+
+#: ../mail/e-mail-display.c:756
+msgid "_View Inline"
+msgstr "Näytä _sisäkkäisesti"
+
+#: ../mail/e-mail-display.c:763
+msgid "Vie_w All Inline"
+msgstr "_Näytä kaikki sisäkkäisesti"
+
+#: ../mail/e-mail-display.c:770
+msgid "_Zoom to 100%"
+msgstr "_Zoomaa kokoon 100 %"
+
+#: ../mail/e-mail-display.c:772
+#, fuzzy
+#| msgid "Reset the text to its original size"
+msgid "Zoom the image to its natural size"
+msgstr "Palauta teksti alkuperäisen kokoiseksi"
+
+#: ../mail/e-mail-display.c:777
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "Sulje tämä ikkuna"
+
+#: ../mail/e-mail-display.c:779
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
 #: ../mail/e-mail-folder-create-dialog.c:327
 msgid "Create Folder"
 msgstr "Luo kansio"
@@ -16212,19 +16084,16 @@ 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
-#| msgid "Answered"
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Vastattu"
 
 #: ../mail/e-mail-free-form-exp.c:237
-#| msgid "Deleted"
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Poistettu"
 
 #: ../mail/e-mail-free-form-exp.c:238
-#| msgid "Draft"
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Luonnos"
@@ -16244,8 +16113,6 @@ msgid "Seen"
 msgstr "Näkemättä"
 
 #: ../mail/e-mail-free-form-exp.c:241
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Liite"
@@ -16295,7 +16162,7 @@ msgid "_Later"
 msgstr "_Myöhemmin"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
@@ -16315,30 +16182,29 @@ msgstr ""
 msgid "Color"
 msgstr "Väri"
 
-#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
 #, fuzzy
 #| msgid "Messages"
 msgid "Message Note"
 msgstr "Viestit"
 
-#: ../mail/e-mail-notes.c:612
+#: ../mail/e-mail-notes.c:639
 #, 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
+#: ../mail/e-mail-notes.c:842
 msgid "Storing changes..."
-msgstr ""
+msgstr "Tallennetaan muutoksia..."
 
-#: ../mail/e-mail-notes.c:940
+#: ../mail/e-mail-notes.c:968
 #, fuzzy
 #| msgid "_Edit Message"
 msgid "Edit Message Note"
 msgstr "_Muokkaa viestiä"
 
-#: ../mail/e-mail-notes.c:1058
-#| msgid "Retrieving message"
+#: ../mail/e-mail-notes.c:1122
 msgid "Retrieving message..."
 msgstr "Noudetaan viestiä..."
 
@@ -16378,11 +16244,11 @@ msgstr "Otsakkeen nimi"
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
+#: ../mail/e-mail-printer.c:111 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/e-mail-printer.c:155
+#: ../mail/e-mail-printer.c:153
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
@@ -16396,7 +16262,7 @@ msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
 #: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Siirrä"
 
@@ -16405,673 +16271,669 @@ msgid "C_opy"
 msgstr "_Kopioi"
 
 #: ../mail/e-mail-reader.c:488
-#, fuzzy
 #| msgid "Delete junk messages on e_xit"
 msgid "Deleting message note..."
-msgstr "Poista roskapostit _suljettaessa"
+msgstr "Poistetaan viestin huomautus..."
 
-#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1562
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1568
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1771
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
+#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Noudetaan viestiä ”%s”"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2004
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2006
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2011
 msgid "_Archive..."
-msgstr ""
+msgstr "_Arkistoi..."
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2013
 #, 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:1979
+#: ../mail/e-mail-reader.c:2018
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2020
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2025
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2027
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2032
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2034
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:2000
-#, fuzzy
+#: ../mail/e-mail-reader.c:2039
 #| msgid "_Add Attachment..."
 msgid "_Add note..."
-msgstr "_Lisää liite..."
+msgstr "_Lisää huomautus..."
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2041
 #, 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
+#: ../mail/e-mail-reader.c:2046
 #| msgid "Delete Memo"
 msgid "Delete no_te"
-msgstr "Poista muistilappu"
+msgstr "Poista _huomautus"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2048
 #, 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
+#: ../mail/e-mail-reader.c:2053
 msgid "_Edit note..."
-msgstr ""
+msgstr "_Muokkaa huomautusta..."
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2055
 #, 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
+#: ../mail/e-mail-reader.c:2060
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2062
 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:2028
+#: ../mail/e-mail-reader.c:2067
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2069
 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:2035
+#: ../mail/e-mail-reader.c:2074
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2076
 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:2042
+#: ../mail/e-mail-reader.c:2081
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2083
 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:2049
+#: ../mail/e-mail-reader.c:2088
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2090
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2095
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2097
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2102
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2104
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2109
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2111
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2116
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2118
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
+#: ../modules/mail/e-mail-attachment-handler.c:434
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2130
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
+#: ../modules/mail/e-mail-attachment-handler.c:441
 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:2105
+#: ../mail/e-mail-reader.c:2144
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
+#: ../modules/mail/e-mail-attachment-handler.c:448
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2158
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2165
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2167
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
+#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
 msgid "_Ignore Subthread"
-msgstr ""
+msgstr "_Jätä huomiotta aliketju"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2174
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
-#, fuzzy
+#: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
 #| msgid "Next _Thread"
 msgid "_Ignore Thread"
-msgstr "Seuraava _säie"
+msgstr "_Jätä huomiotta ketju"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2181
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2186
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2188
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2193
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2195
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2200
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2202
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2207
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2209
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2216
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
+#: ../mail/e-mail-reader.c:2221 ../mail/e-mail-reader.c:2590
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2223
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2228
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2230
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2235
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2237
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2249
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2251
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2256
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2258
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2263
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2265
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2270
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2272
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2277
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2279
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2284
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2286
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2291
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2293
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2298
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2300
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2305
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2307
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2312
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2314
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2319
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2321
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2328
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2335
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2347
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2349
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2354
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2356
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2361 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:397
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
+#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:404
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
 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:2336
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2382
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2384
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2389
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2391
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2403
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2405
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2410
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2412
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2417
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2419
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2426
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2394
+#: ../mail/e-mail-reader.c:2433
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2440
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2454
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2461
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2468
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2475
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2482
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2492
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2494
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2499
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:2462
+#: ../mail/e-mail-reader.c:2501
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2506
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../mail/e-mail-reader.c:2469
+#: ../mail/e-mail-reader.c:2508
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2513
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../mail/e-mail-reader.c:2476
+#: ../mail/e-mail-reader.c:2515
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../mail/e-mail-reader.c:2515
+#: ../mail/e-mail-reader.c:2554
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../mail/e-mail-reader.c:2531
+#: ../mail/e-mail-reader.c:2570
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2574
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2539
+#: ../mail/e-mail-reader.c:2578
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2543
+#: ../mail/e-mail-reader.c:2582
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2594
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/e-mail-reader.c:2559
+#: ../mail/e-mail-reader.c:2598
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:2603
+#: ../mail/e-mail-reader.c:2642
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:2605
+#: ../mail/e-mail-reader.c:2644
 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:2611
+#: ../mail/e-mail-reader.c:2650
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:2613
+#: ../mail/e-mail-reader.c:2652
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:3164
+#: ../mail/e-mail-reader.c:3192
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../mail/e-mail-reader.c:4216
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:4217
+#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:4236
+#: ../mail/e-mail-reader.c:4262
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:4237
+#: ../mail/e-mail-reader.c:4263
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
+#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:4315
+#: ../mail/e-mail-reader.c:4341
 #: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:4319
+#: ../mail/e-mail-reader.c:4345
 #: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/e-mail-reader.c:5406
+#: ../mail/e-mail-reader.c:5426
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5408
+#: ../mail/e-mail-reader.c:5428
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5425
+#: ../mail/e-mail-reader.c:5445
 #, c-format
 msgid "Allow remote content from %s"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:5442
-#| msgid "_Do not show this message again"
+#: ../mail/e-mail-reader.c:5462
 msgid "Do not show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../mail/e-mail-reader.c:5490
-#| msgid "Header content"
+#: ../mail/e-mail-reader.c:5510
 msgid "Load remote content"
 msgstr "Lataa etäsisältö"
 
@@ -17079,37 +16941,36 @@ msgstr "Lataa etäsisältö"
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
 
-#: ../mail/e-mail-reader-utils.c:572
+#: ../mail/e-mail-reader-utils.c:570
 #, c-format
-#| msgid "Removing folder '%s'"
 msgid "Refreshing folder '%s'"
 msgstr "Päivitetään kansiota '%s'"
 
-#: ../mail/e-mail-reader-utils.c:1165
+#: ../mail/e-mail-reader-utils.c:1163
 #, fuzzy
 #| msgid "Preview data to be imported"
 msgid "Marking thread to be ignored"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../mail/e-mail-reader-utils.c:1169
+#: ../mail/e-mail-reader-utils.c:1167
 msgid "Unmarking thread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1173
+#: ../mail/e-mail-reader-utils.c:1171
 msgid "Marking subthread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1177
+#: ../mail/e-mail-reader-utils.c:1175
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1421
+#: ../mail/e-mail-reader-utils.c:1419
 msgid "Printing"
 msgstr "Tulostetaan"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1658
+#: ../mail/e-mail-reader-utils.c:1656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -17124,7 +16985,7 @@ msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa "
 "sen?"
 
-#: ../mail/e-mail-reader-utils.c:2489
+#: ../mail/e-mail-reader-utils.c:2656
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -17135,17 +16996,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:2510
+#: ../mail/e-mail-reader-utils.c:2677
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../mail/e-mail-reader-utils.c:2883
+#: ../mail/e-mail-reader-utils.c:3050
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
-#: ../mail/e-mail-request.c:207
+#: ../mail/e-mail-request.c:272
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
@@ -17197,15 +17058,15 @@ 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
+#: ../mail/em-composer-utils.c:791
 msgid "Waiting for attachments to load..."
-msgstr ""
+msgstr "Odotetaan liitteiden latautumista..."
 
 #. 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:1686
+#: ../mail/em-composer-utils.c:1742
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17213,24 +17074,24 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1748
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1697
+#: ../mail/em-composer-utils.c:1753
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-composer-utils.c:2984
+#: ../mail/em-composer-utils.c:2968
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3471
+#: ../mail/em-composer-utils.c:3440
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:3476
+#: ../mail/em-composer-utils.c:3445
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -17239,110 +17100,103 @@ msgid "Select Folder"
 msgstr "Valitse kansio"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:587
+#: ../mail/em-filter-rule.c:597
 msgid "Then"
 msgstr "sitten"
 
-#: ../mail/em-filter-rule.c:652
+#: ../mail/em-filter-rule.c:662
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:227
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:238
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../mail/em-folder-properties.c:210
+#: ../mail/em-folder-properties.c:259
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../mail/em-folder-properties.c:212
+#: ../mail/em-folder-properties.c:261
 #, c-format
 msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:287
+#: ../mail/em-folder-properties.c:385
 msgid "_Send Account Override:"
-msgstr ""
+msgstr "_Lähetystilin ohitus:"
 
-#: ../mail/em-folder-properties.c:491
+#: ../mail/em-folder-properties.c:589
 msgid "_Archive this folder using these settings:"
-msgstr ""
+msgstr "_Arkistoi tämä kansio käyttäen seuraavia asetuksia:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:500
-#, fuzzy
+#: ../mail/em-folder-properties.c:598
 #| msgid "Sent _Messages Folder:"
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
-msgstr "Lähetettyjen _viestien kansio:"
+msgstr "_Siivoa vanhemmat viestit kuin"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:516
-#, fuzzy
+#: ../mail/em-folder-properties.c:614
 #| msgid "days"
 msgctxt "autoarchive"
 msgid "days"
-msgstr "päivä"
+msgstr "päivää"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:518
-#, fuzzy
+#: ../mail/em-folder-properties.c:616
 #| msgid "weeks"
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "viikkoa"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:520
-#, fuzzy
+#: ../mail/em-folder-properties.c:618
 #| msgid "months"
 msgctxt "autoarchive"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../mail/em-folder-properties.c:526
-#, fuzzy
+#: ../mail/em-folder-properties.c:624
 #| msgid "Move selected messages to another folder"
 msgid "Move old messages to the default archive _folder"
-msgstr "Siirrä valitut viestit toiseen kansioon"
+msgstr "Siirrä valitut viestit _oletusarkistokansioon"
 
-#: ../mail/em-folder-properties.c:537
-#, fuzzy
+#: ../mail/em-folder-properties.c:635
 #| msgid "Moving messages to '%s'"
 msgid "_Move old messages to:"
-msgstr "Siirretään viestejä kansioon ”%s”"
+msgstr "Siirrä va_nhat viestit kansioon:"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "AutoArchive folder"
-msgstr ""
+msgstr "Automaattisen arkistoinnin kansio"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for AutoArchive"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/em-folder-properties.c:547
-#| msgid "Delete junk messages on e_xit"
+#: ../mail/em-folder-properties.c:645
 msgid "_Delete old messages"
 msgstr "_Poista vanhat viestit"
 
-#: ../mail/em-folder-properties.c:606
+#: ../mail/em-folder-properties.c:704
 msgid "AutoArchive"
-msgstr ""
+msgstr "Automaattinen arkistointi"
 
-#: ../mail/em-folder-properties.c:685
+#: ../mail/em-folder-properties.c:783
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
@@ -17378,12 +17232,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -17398,7 +17252,7 @@ msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "Ladataan..."
 
@@ -17422,8 +17276,8 @@ msgstr "_Tilaa näytetyt"
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
+#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
@@ -17437,7 +17291,7 @@ msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -17445,73 +17299,73 @@ msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../mail/em-subscription-editor.c:1911
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../mail/em-subscription-editor.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "Pienennä kaikki"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../mail/em-subscription-editor.c:1974
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../mail/em-subscription-editor.c:1976
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: ../mail/em-subscription-editor.c:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
-#: ../mail/em-subscription-editor.c:1986
+#: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Pysäytä"
@@ -17537,13 +17391,12 @@ msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
 #: ../mail/em-utils.c:1680
-#| msgid "Delete junk messages on e_xit"
 msgid "Deleting old messages"
 msgstr "Poistetaan vanhoja viestejä"
 
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
-msgstr "_Hakunäkymät"
+msgstr "_Hakukansiot"
 
 #: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
@@ -17761,17 +17614,15 @@ msgstr "ei ole merkitty"
 
 #: ../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"
+msgstr "on valmis"
 
 #: ../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"
+msgstr "ei ole valmis"
 
 #: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
 #: ../mail/vfoldertypes.xml.in.h:54
@@ -17928,8 +17779,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:173
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -17938,15 +17788,14 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
 #: ../mail/importers/kmail-importer.c:263
-#, fuzzy, c-format
+#, c-format
 #| msgid "Address"
 msgid "%d Address"
 msgid_plural "%d Addresses"
-msgstr[0] "Osoite"
-msgstr[1] "Osoite"
+msgstr[0] "%d osoite"
+msgstr[1] "%d osoitetta"
 
 #: ../mail/importers/kmail-importer.c:354
-#| msgid "Evolution Elm importer"
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail-tuoja"
 
@@ -17957,7 +17806,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:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -18070,16 +17919,14 @@ msgid "For_mat messages in HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
 #: ../mail/mail-config.ui.h:10
-#, fuzzy
 #| msgid "Automatically insert _emoticon images"
 msgid "Automatically insert _emoticons"
-msgstr "Lisää _hymiöt kuvina automaattisesti"
+msgstr "Lisää _hymiöt automaattisesti"
 
 #: ../mail/mail-config.ui.h:11
-#, fuzzy
 #| msgid "Use Unicode characters for smileys."
 msgid "Use Un_icode characters for emoticons"
-msgstr "Käytä Unicode-merkkejä hymiöitä varten."
+msgstr "Käytä _Unicode-merkkejä hymiöitä varten."
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -18090,13 +17937,12 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Muotoile tiedostonimet Outlookin ja _GMailin tapaan."
 
 #: ../mail/mail-config.ui.h:14
-#, fuzzy
 msgid "Send messages through Outbo_x folder"
-msgstr "Tallennetaan viestiä kansioon"
+msgstr "Lähetä viestit Outbo_x-kansion kautta"
 
 #: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
-msgstr ""
+msgstr "Merkkien määrä ennen _sanarivitystä:"
 
 #: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
@@ -18123,14 +17969,12 @@ msgid "_Keep signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
 #: ../mail/mail-config.ui.h:22
-#, fuzzy
 msgid "Ig_nore Reply-To: for mailing lists"
-msgstr "Älä huomioi postituslistojen Reply-To-otsaketta"
+msgstr "Älä huomioi _postituslistojen Reply-To-otsaketta"
 
 #: ../mail/mail-config.ui.h:23
-#, fuzzy
 msgid "Gro_up Reply goes only to mailing list, if possible"
-msgstr "Ryhmävastaus menee vain sähköpostilistalle, jos mahdollista"
+msgstr "Ryhmävastaus menee vain sä_hköpostilistalle, jos mahdollista"
 
 #: ../mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
@@ -18238,26 +18082,24 @@ 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:61
-#, fuzzy
 #| msgid "Search Folders"
 msgid "Use for Folders"
-msgstr "Hakunäkymät"
+msgstr "Käytä kansioille"
 
 #. 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:66
-#, fuzzy
 #| msgid "Sender or Recipients"
 msgid "Use for Recipients"
-msgstr "Lähettäjä tai vastaanottajat"
+msgstr "Käytä vastaanottajille"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
 msgid "Account"
 msgstr "Tili"
 
 #: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
-msgstr ""
+msgstr "Lähetystilin ohitukset"
 
 #: ../mail/mail-config.ui.h:70
 msgid ""
@@ -18266,10 +18108,14 @@ msgid ""
 "recipients can contain partial addresses or names. The name and the address "
 "parts are compared separately."
 msgstr ""
+"Määritä, mitä tiliä käytetään lähettämiseen tiettyjen kansioiden tai "
+"vastaanottajien suhteen. Tämä asetus ohittaa tavallisen lähetystilin "
+"havaitsemisen. Vastaanottajaluettelo voi sisältää vaillinaisia osoitteita "
+"tai nimiä. Nimi- ja osoitekohtia vertaillaan erikseen."
 
 #: ../mail/mail-config.ui.h:71
 msgid "_Folder override has precedence over Recipient override"
-msgstr ""
+msgstr "_Kansiotason ohitus ylittää vastaanottajatason ohituksen"
 
 #: ../mail/mail-config.ui.h:72
 msgid "Send Account"
@@ -18362,11 +18208,11 @@ msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
 #: ../mail/mail-config.ui.h:100
 msgid "Archive Mail"
-msgstr ""
+msgstr "Arkistoi viestit"
 
 #: ../mail/mail-config.ui.h:101
 msgid "On This Computer A_rchive folder:"
-msgstr ""
+msgstr "Arkistointikansio t_ällä tietokoneella:"
 
 #: ../mail/mail-config.ui.h:102
 msgid "Archive folder to use for On This Computer messages"
@@ -18383,7 +18229,7 @@ msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua
 
 #: ../mail/mail-config.ui.h:106
 msgid "Loading Remote Content"
-msgstr "Ladataan etäsisältöä"
+msgstr "Etäsisällön lataaminen"
 
 #: ../mail/mail-config.ui.h:107
 msgid "_Never load remote content from the Internet"
@@ -18398,10 +18244,9 @@ msgid "_Always load remote content from the Internet"
 msgstr "Lataa _aina etäsisältö verkosta"
 
 #: ../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"
+msgstr "_Huomauta puuttuvasta etäsisällöstä viestien esikatselussa"
 
 #: ../mail/mail-config.ui.h:111
 msgid "Add"
@@ -18413,13 +18258,12 @@ msgstr "Poista"
 
 #: ../mail/mail-config.ui.h:113
 msgid "Allow for sites:"
-msgstr ""
+msgstr "Salli sivustoille:"
 
 #: ../mail/mail-config.ui.h:114
-#, fuzzy
 #| msgid "All local folders"
 msgid "Allow for senders:"
-msgstr "Kaikki paikalliset kansiot"
+msgstr "Salli lähettäjille:"
 
 #: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
@@ -18439,7 +18283,7 @@ msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
 #: ../mail/mail-config.ui.h:119
 msgid "Search gra_vatar.com for the photograph of sender"
-msgstr ""
+msgstr "Etsi lähettäjän kuvaa _gravatar.comista"
 
 #: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
@@ -18460,16 +18304,14 @@ msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
 #: ../mail/mail-config.ui.h:125
-#, fuzzy
 #| msgid "Delete junk messages on e_xit"
 msgid "_Delete junk messages"
-msgstr "Poista roskapostit _suljettaessa"
+msgstr "Poista roskapostivi_estit"
 
 #: ../mail/mail-config.ui.h:126
-#, fuzzy
 #| msgid "Junk Test"
 msgid "Junk Test Options"
-msgstr "Roskapostitesti"
+msgstr "Roskapostitestaus"
 
 #: ../mail/mail-config.ui.h:127
 msgid "Do not mar_k messages as junk if sender is in my address book"
@@ -18484,8 +18326,8 @@ msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
 #: ../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
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
 msgid "No encryption"
 msgstr "Ei salausta"
 
@@ -18745,57 +18587,62 @@ msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
 #: ../mail/mail.error.xml.h:34
+#, fuzzy
+#| msgid ""
+#| "Unable to open the drafts folder for this account. Use the system drafts "
+#| "folder instead?"
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was &quot;{0}&quot;."
 msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 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:37
+#: ../mail/mail.error.xml.h:39
 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:38
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 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:40
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 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:42
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 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:44
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -18806,55 +18653,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:48
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa komentoa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Virhe suoritettaessa toimenpidettä."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Syötä salasana."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten määrittelyjä."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Hakemistoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Tiedostoon \"{0}\" ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Tallennushakemisto ei voi luoda, syy: \"{1}\""
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voi luoda."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitä ei voi ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voi poistaa."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18862,25 +18709,25 @@ msgstr ""
 "Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voi nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 #, 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:63
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Kansion &quot;{0}&quot; päivittäminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voi siirtää tai nimetä uudestaan."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Poistetaanko todella kansio \"{0}\" ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -18888,20 +18735,38 @@ msgstr ""
 "Jos poistat kansion, menetetään kaikki sen sisältö ja alikansiot "
 "sisältöineen pysyvästi."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
+#, fuzzy
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really unsubscribe folder \"{0}\"?"
+msgstr "Haluatko varmasti poistaa kansion ”{0}”?"
+
+#: ../mail/mail.error.xml.h:71
+msgid ""
+"If you unsubscribe the folder, it might not be visible in the Evolution, "
+"while still being available on the server. You can re-subscribe in Folder-"
+">Subscriptions... menu."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:72
+#| msgid "_Unsubscribe"
+msgid "Do _Not Unsubscribe"
+msgstr "_Älä peru tilausta"
+
+#: ../mail/mail.error.xml.h:74
 msgid "Really delete folder \"{0}\"?"
 msgstr "Haluatko varmasti poistaa kansion ”{0}”?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 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:70
+#: ../mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "Nämä viestit eivät ole kopioita."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 #, fuzzy
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
@@ -18912,63 +18777,63 @@ msgstr ""
 "alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ei voi nimetä uudestaan nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 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:74
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Lähdekansiota ei voi avata. Virhe: {2}"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Kohdekansiota ei voi avata. Virhe: {2}"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi kopioida nimelle \"{1}\"."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi luoda."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Kansiota ei voi avata. Virhe: {1}"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 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:82
+#: ../mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:89
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 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:86
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18976,30 +18841,30 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
 "poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 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:89
+#: ../mail/mail.error.xml.h:95
 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:90
+#: ../mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "_Älä poista käytöstä"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "Älä _käytä"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:98
 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:93
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -19007,39 +18872,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:95
+#: ../mail/mail.error.xml.h:101
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Hakunäkymää \"{0}\" ei voi lisätä."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 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:97
+#: ../mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "Kansiota ei ole valittu."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -19049,11 +18914,11 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota \"{0}\"."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -19064,19 +18929,19 @@ msgstr ""
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid "Evolution's local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:120
 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 "
@@ -19087,20 +18952,20 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "_Poistu Evolutionista"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 #, fuzzy
 msgid "_Migrate Now"
 msgstr "Siirto"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 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."
@@ -19108,30 +18973,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:121
+#: ../mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "Tuettujen tunnistautumistapojen kysely palvelimelta epäonnistui."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:130
 #, fuzzy
 #| msgid "Failed to retrieve messages."
 msgid "Failed to get server setup."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetöntä käyttöä varten?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -19139,27 +19004,27 @@ msgstr ""
 "Haluatko synkronoida paikallisesti kansiot, jotka on merkitty yhteydettömään "
 "käyttöön?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "Ä_lä synkronoi"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Synkronoi"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "Haluatko merkitä kaikki viestit luetuiksi?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:136
 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:131
+#: ../mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "Merkitse viestit myös alikansioissa?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19167,76 +19032,76 @@ msgstr ""
 "Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
 "kaikissa sen alikansioissa?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "Vain nykyisessä _kansiossa"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 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:136
+#: ../mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "_Kyllä, aina"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "Ei, ei koskaan"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 #, fuzzy
 #| msgid "Copying folder %s"
 msgid "Copy folder in folder tree."
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:145
 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:141
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not copy"
 msgstr "Älä ko_pioi"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "_Always copy"
 msgstr "_Kopioi aina"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 #, fuzzy
 #| msgid "N_ever"
 msgid "N_ever copy"
 msgstr "E_i koskaan"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Move folder in folder tree."
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:151
 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:147
+#: ../mail/mail.error.xml.h:153
 msgid "Do _not move"
 msgstr "Ä_lä siirrä"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Always move"
 msgstr "_Siirrä aina"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:155
 #, fuzzy
 #| msgid "N_ever"
 msgid "N_ever move"
 msgstr "E_i koskaan"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -19244,75 +19109,75 @@ msgstr ""
 "Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:157
 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:152
+#: ../mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 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:154
+#: ../mail/mail.error.xml.h:160
 msgid "\"Check Junk\" Failed"
 msgstr "”Etsi roskapostia” epäonnistui"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "\"Report Junk\" Failed"
 msgstr "”Ilmoita roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "\"Report Not Junk\" Failed"
 msgstr "”Ilmoita ei-roskapostiksi” epäonnistui"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "Poistetaanko viestien kaksoiskappaleet?"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "Kaksoiskappaleita ei löytynyt."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 #, 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:162
+#: ../mail/mail.error.xml.h:168
 #, 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:163
+#: ../mail/mail.error.xml.h:169
 #, fuzzy
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "Viestin nouto ei onnistunut."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:172
 #, 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:167
+#: ../mail/mail.error.xml.h:173
 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 "
@@ -19321,40 +19186,40 @@ msgid ""
 "available in offline mode."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to open folder."
 msgstr "Kansion avaus epäonnistui."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "VIestin kaksoiskappaleiden etsiminen epäonnistui."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:178
 msgid "Failed to mark messages as read."
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "Liitteiden poisto viesteistä epäonnistui."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:180
 #, fuzzy
 msgid "Failed to download messages for offline viewing."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "Viestien tallennus levylle epäonnistui."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "Piilotiedosto on liitetty."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:183
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -19362,90 +19227,92 @@ 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:178
+#: ../mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "Tulostus epäonnistui."
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:185
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Tulostimen vastaus: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:186
 #, fuzzy
 #| msgid "Could not open destination"
 msgid "Could not perform this operation on {0}."
 msgstr "Kohdetta ei voi avata"
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:187
 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:182
+#: ../mail/mail.error.xml.h:188
 msgid "Message from &quot;{0}&quot; account:"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:189
 #, 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:184
+#: ../mail/mail.error.xml.h:190
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:191
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:192
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:193
 msgid "Remote content download had been blocked for this message."
 msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:194
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
 msgstr ""
+"Voit ladata etäsisällön itse, tai asettaa etäsisällön latautumisen "
+"automaattiseksi tämän lähettäjän tai sivustoston perusteella."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:190
+#: ../mail/mail.error.xml.h:196
 #, 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:192
+#: ../mail/mail.error.xml.h:198
 msgid "{0} by {1}"
 msgstr ""
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:194
+#: ../mail/mail.error.xml.h:200
 msgid "Overdue: {0} by {1}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:196
+#: ../mail/mail.error.xml.h:202
 #, 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
+#: ../mail/mail.error.xml.h:205
 #, 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
+#: ../mail/mail.error.xml.h:207
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to store message note in folder '{0}'"
@@ -19455,40 +19322,40 @@ msgstr "Tapaaminen löytyi kalenterista \"%s\""
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:650
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:1225
-#, fuzzy, c-format
+#: ../mail/mail-send-recv.c:1229
+#, c-format
 #| msgid "Checking for new mail"
 msgid "Checking for new mail at '%s'"
-msgstr "Tarkistetaan onko uusia viestejä"
+msgstr "Tarkistetaan onko uusia viestejä palvelusta '%s'"
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1458
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at '%s'"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1460
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at '%s'"
@@ -19506,87 +19373,87 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:297
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:313
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:318
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:464 ../mail/message-list.c:6168
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:2069
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:2089
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:2091
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2997
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../mail/message-list.c:3699 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../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:5105
+#: ../mail/message-list.c:5117
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-list.c:6107
+#: ../mail/message-list.c:6125
 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 "
@@ -19594,7 +19461,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:6115
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -19641,32 +19508,32 @@ msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2159
+#: ../modules/mail/e-mail-shell-view-actions.c:2239
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2152
+#: ../modules/mail/e-mail-shell-view-actions.c:2232
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2173
+#: ../modules/mail/e-mail-shell-view-actions.c:2253
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2166
+#: ../modules/mail/e-mail-shell-view-actions.c:2246
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2138
+#: ../modules/mail/e-mail-shell-view-actions.c:2218
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2145
+#: ../modules/mail/e-mail-shell-view-actions.c:2225
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -19684,7 +19551,7 @@ msgstr "Osoitteen muotoilu"
 
 #: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
-msgstr ""
+msgstr "_Muotoile osoite sen kohdemaan standardien mukaisesti"
 
 #: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
@@ -19694,22 +19561,22 @@ msgstr "Automaattinen täydennys"
 msgid "Always _show address of the autocompleted contact"
 msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:100
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../modules/addressbook/eab-composer-util.c:108
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../modules/addressbook/eab-composer-util.c:119
+#: ../modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:148
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
@@ -19830,7 +19697,7 @@ msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
@@ -19911,7 +19778,7 @@ msgstr "T_oiminnot"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Preview"
 msgstr "_Esikatselu"
 
@@ -19919,7 +19786,6 @@ msgstr "_Esikatselu"
 #: ../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ä..."
 
@@ -19947,7 +19813,7 @@ msgstr "Näytä yhteystiedon esikatseluruutu"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
@@ -19958,7 +19824,7 @@ msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:2127
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
@@ -19977,7 +19843,7 @@ msgstr "Täsmäämättömät"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:2211
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Oma haku"
@@ -20079,7 +19945,7 @@ msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 #: ../modules/backup-restore/evolution-backup-restore.c:336
 #, c-format
 msgid "Checking content of backup file '%s', please wait..."
-msgstr ""
+msgstr "Tarkistetaan varmuuskopiotiedoston '%s' sisältöä, odota hetki..."
 
 #: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
@@ -20294,9 +20160,8 @@ msgstr ""
 #: ../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."
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
 msgid "User name cannot be empty"
 msgstr "Käyttäjätunnus ei voi olla tyhjä"
 
@@ -20306,7 +20171,6 @@ msgstr "Standardi LDAP_portti"
 
 #: ../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)"
 
@@ -20332,8 +20196,8 @@ msgid "Port:"
 msgstr "Portti:"
 
 #: ../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
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
 msgid "Port number is not valid"
 msgstr "Portin numero ei ole kelvollinen"
 
@@ -20346,8 +20210,8 @@ msgid "Encryption:"
 msgstr "Salaus:"
 
 #: ../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
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
@@ -20453,71 +20317,78 @@ 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."
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
 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/book-config-webdav/evolution-book-config-webdav.c:92
+#| msgid "New Address Book"
+msgid "Choose an Address Book"
+msgstr "Valitse osoitekirja"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
-#| msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+#| msgid "Address Book"
+msgid "Find Address Books"
+msgstr "Etsi osoitekirjoja"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
 msgid "Avoid IfMatch (needed on Apache < 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/book-config-webdav/evolution-book-config-webdav.c:308
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
 msgid "URL is not a valid http:// nor https:// URL"
-msgstr ""
+msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
 #: ../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-caldav/evolution-cal-config-caldav.c:113
 #: ../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-caldav/evolution-cal-config-caldav.c:117
 #: ../modules/cal-config-google/e-google-chooser-button.c:232
 #, fuzzy
 #| msgid "Select a Task List"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
-#, fuzzy
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 #| msgid "Web Calendars"
 msgid "Find Calendars"
-msgstr "Web-kalenterit"
+msgstr "Etsi kalentereja"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 msgid "Email:"
 msgstr "Sähköposti_"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
@@ -20589,7 +20460,6 @@ 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ä"
 
@@ -20877,13 +20747,12 @@ msgstr "Päivä _päättyy:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Create events, memos and tasks as _Private by default"
-msgstr ""
+msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksit_yisenä oletuksena"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
-#, fuzzy
 #| msgid "Send Options"
 msgid "View Options"
-msgstr "Lähetysasetukset"
+msgstr "Näkymän valinnat"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
@@ -20894,10 +20763,9 @@ 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: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ä"
+msgstr "Näytä tapaami_skuvakkeet kuukausinäkymässä"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
@@ -20910,6 +20778,7 @@ msgstr "Näytä viikko_numerot"
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
+"N_äytä toistuvat tapahtumat kursivoituna vasemman alareunan kalenterissa"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
@@ -20944,15 +20813,13 @@ msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:67
-#, fuzzy
 msgid "Display reminders in _notification area only"
-msgstr "Näytä hälytykset vain _ilmoitusalueella"
+msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
 #: ../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"
+msgstr "Poista muistutukset _valmistuneista tehtävistä"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:70
@@ -20976,12 +20843,11 @@ msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default _snooze time (in minutes)"
-msgstr ""
+msgstr "Oletus_torkkuaika (minuuteissa)"
 
 #: ../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"
+msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default Free/Busy Server"
@@ -20993,9 +20859,8 @@ 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:83
-#, fuzzy
 msgid "Publishing Information"
-msgstr "Julkaisupaikka"
+msgstr "Julkaisutiedot"
 
 #: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
@@ -21117,7 +20982,6 @@ msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1264
-#| msgid "_Save as iCalendar..."
 msgid "_Manage Calendar groups..."
 msgstr "_Hallitse kalenteriryhmiä..."
 
@@ -21171,10 +21035,9 @@ msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
 #: ../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"
+msgstr "Näytä _kaikki kalenterit"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
@@ -21384,7 +21247,7 @@ msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-backend.c:81
 #: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
@@ -21411,29 +21274,29 @@ msgstr "_Avaa www-sivu"
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
@@ -21476,7 +21339,7 @@ msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-backend.c:79
 #: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
@@ -21496,26 +21359,26 @@ msgstr "Näytä valitut tehtävät"
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-backend.c:98
 #: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
@@ -21624,26 +21487,26 @@ msgstr[1] "%d muistilappua"
 msgid "%d selected"
 msgstr ", %d valittu"
 
-#: ../modules/calendar/e-task-shell-backend.c:61
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../modules/calendar/e-task-shell-backend.c:68
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:70
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:78
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-backend.c:96
 #: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
@@ -21786,291 +21649,293 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
 msgid "Display part as an invitation"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:226
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../modules/itip-formatter/itip-view.c:264
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:254
+#: ../modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:258
+#: ../modules/itip-formatter/itip-view.c:292
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:286
+#: ../modules/itip-formatter/itip-view.c:320
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:291
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:329
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:313
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e"
 msgstr "+%Ana %e. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:319
+#: ../modules/itip-formatter/itip-view.c:353
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %e. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:323
+#: ../modules/itip-formatter/itip-view.c:357
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %e. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:362
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %e. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:366
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %e. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:338
+#: ../modules/itip-formatter/itip-view.c:372
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %e. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:343
+#: ../modules/itip-formatter/itip-view.c:377
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %e. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:381
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %e. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:386
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:390
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:394
-#: ../modules/itip-formatter/itip-view.c:395
-#: ../modules/itip-formatter/itip-view.c:484
-#: ../modules/itip-formatter/itip-view.c:485
-#: ../modules/itip-formatter/itip-view.c:574
+#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:429
+#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:519
+#: ../modules/itip-formatter/itip-view.c:608
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../modules/itip-formatter/itip-view.c:399
-#: ../modules/itip-formatter/itip-view.c:489
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../modules/itip-formatter/itip-view.c:416
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../modules/itip-formatter/itip-view.c:424
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:460
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:436
+#: ../modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:472
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:442
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
+#: ../modules/itip-formatter/itip-view.c:476
+#, fuzzy, c-format
+#| msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s perui seuraavan kokouksen %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:444
-#, c-format
-msgid "%s has canceled the following meeting:"
+#: ../modules/itip-formatter/itip-view.c:478
+#, fuzzy, c-format
+#| msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../modules/itip-formatter/itip-view.c:448
+#: ../modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:454
+#: ../modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:506
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:514
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:550
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:554
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -22078,337 +21943,342 @@ msgid ""
 msgstr ""
 "%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:556
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:526
+#: ../modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:562
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:532
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
+#: ../modules/itip-formatter/itip-view.c:566
+#, fuzzy, c-format
+#| msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:534
-#, c-format
-msgid "%s has canceled the following assigned task:"
+#: ../modules/itip-formatter/itip-view.c:568
+#, fuzzy, c-format
+#| msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:538
+#: ../modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:544
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:621
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:628
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../modules/itip-formatter/itip-view.c:598
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
+#: ../modules/itip-formatter/itip-view.c:632
+#, fuzzy, c-format
+#| msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:600
-#, c-format
-msgid "%s has canceled the following shared memo:"
+#: ../modules/itip-formatter/itip-view.c:634
+#, fuzzy, c-format
+#| msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s on perunut seuraavan jaetun muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:674
+#: ../modules/itip-formatter/itip-view.c:859
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:865
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:680
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:865
+#: ../modules/itip-formatter/itip-view.c:1667
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:874
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:689
-#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:874
+#: ../modules/itip-formatter/itip-view.c:1668
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1205
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1208
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1211
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1214
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1217
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1220
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1223
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../modules/itip-formatter/itip-view.c:1060
+#: ../modules/itip-formatter/itip-view.c:1226
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../modules/itip-formatter/itip-view.c:1063
+#: ../modules/itip-formatter/itip-view.c:1229
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../modules/itip-formatter/itip-view.c:1232
+#: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../modules/itip-formatter/itip-view.c:1518
-#: ../modules/itip-formatter/itip-view.c:1566
-#: ../modules/itip-formatter/itip-view.c:1637
+#: ../modules/itip-formatter/itip-view.c:1670
+#: ../modules/itip-formatter/itip-view.c:1718
+#: ../modules/itip-formatter/itip-view.c:1789
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1706
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../modules/itip-formatter/itip-view.c:1721
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1572
+#: ../modules/itip-formatter/itip-view.c:1724
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../modules/itip-formatter/itip-view.c:1573
+#: ../modules/itip-formatter/itip-view.c:1725
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1726
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1727
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1908
+#: ../modules/itip-formatter/itip-view.c:2036
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:2039
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../modules/itip-formatter/itip-view.c:3217
+#: ../modules/itip-formatter/itip-view.c:2952
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:3392
+#: ../modules/itip-formatter/itip-view.c:4848
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../modules/itip-formatter/itip-view.c:3859
+#: ../modules/itip-formatter/itip-view.c:3557
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../modules/itip-formatter/itip-view.c:3889
+#: ../modules/itip-formatter/itip-view.c:3587
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../modules/itip-formatter/itip-view.c:4024
+#: ../modules/itip-formatter/itip-view.c:3721
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:4032
+#: ../modules/itip-formatter/itip-view.c:3729
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../modules/itip-formatter/itip-view.c:4037
+#: ../modules/itip-formatter/itip-view.c:3734
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../modules/itip-formatter/itip-view.c:4042
+#: ../modules/itip-formatter/itip-view.c:3739
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../modules/itip-formatter/itip-view.c:4387
+#: ../modules/itip-formatter/itip-view.c:4083
 msgid "Opening the calendar. Please wait..."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4392
+#: ../modules/itip-formatter/itip-view.c:4088
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4487
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4502
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4507
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4513
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../modules/itip-formatter/itip-view.c:4819
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
+#: ../modules/itip-formatter/itip-view.c:4519
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar '%s' as cancelled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4539
+#: ../modules/itip-formatter/itip-view.c:4985
+#: ../modules/itip-formatter/itip-view.c:5088
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4580
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:4772
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:4789
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:4793
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:4840
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:4875
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:4950
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../modules/itip-formatter/itip-view.c:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5021
+#: ../modules/itip-formatter/itip-view.c:5059
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5120
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5125
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5130
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5141
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Unable to send task information, the task does not exist"
 msgstr "Tehtävän tietoja ei voitu lähettää, koska tehtävää ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5151
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5216
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5221
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5269
+#: ../modules/itip-formatter/itip-view.c:5282
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5270
+#: ../modules/itip-formatter/itip-view.c:5283
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -22416,15 +22286,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5325
+#: ../modules/itip-formatter/itip-view.c:5355
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5326
+#: ../modules/itip-formatter/itip-view.c:5356
+#: ../modules/itip-formatter/itip-view.c:5459
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -22432,11 +22302,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../modules/itip-formatter/itip-view.c:5689
+#: ../modules/itip-formatter/itip-view.c:5371
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5372
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -22444,24 +22314,24 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:5890
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:5906
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6072
 msgid "This meeting recurs"
 msgstr "Tapaaminen on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6075
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6078
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
@@ -22482,19 +22352,19 @@ 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:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:270
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 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:279
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 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:288
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "Sinun on mahdollisesti sallittava IMAP-käyttö"
 
@@ -22579,42 +22449,49 @@ msgstr "Valitse palautettava tiedosto"
 msgid "Mbox spool directory cannot be empty"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "_Port:"
 msgstr "_Portti:"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+#, fuzzy
+#| msgid "Enter password"
+msgid "_Forget password"
+msgstr "Syötä salasana"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
 msgid "Encryption _method:"
 msgstr "Salaus_tapa:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 #, fuzzy
 #| msgid "SSL on a dedicated port"
 msgid "TLS on a dedicated port"
@@ -22660,427 +22537,478 @@ 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
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Yahoo!-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Lisää Yahoo!-kalenteri ja -tehtävät tälle tilille"
 
-#: ../modules/mail/e-mail-attachment-handler.c:440
+#: ../modules/mail/e-mail-attachment-handler.c:673
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../modules/mail/e-mail-shell-backend.c:353
+#: ../modules/mail/e-mail-shell-backend.c:377
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:355
+#: ../modules/mail/e-mail-shell-backend.c:379
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:363
+#: ../modules/mail/e-mail-shell-backend.c:387
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:389
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:370
+#: ../modules/mail/e-mail-shell-backend.c:394
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:372
+#: ../modules/mail/e-mail-shell-backend.c:396
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:687
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:711
+msgctxt "NetworkMonitor"
+msgid "base"
+msgstr ""
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:714
+msgctxt "NetworkMonitor"
+msgid "netlink"
+msgstr ""
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:717
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr "networkmanager"
+
+#: ../modules/mail/e-mail-shell-backend.c:749
+msgctxt "NetworkMonitor"
+msgid "Method to detect _online state:"
+msgstr "Yhteydellisen tilan _havaintatapa:"
+
+#. Always as the first
+#: ../modules/mail/e-mail-shell-backend.c:758
+#| msgid "Default"
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "Oletus"
+
+#. Always as the last
+#: ../modules/mail/e-mail-shell-backend.c:772
+#| msgid "_Always move"
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "Aina yhteydessä"
+
+#: ../modules/mail/e-mail-shell-backend.c:832
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:696
+#: ../modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:705
+#: ../modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:715
+#: ../modules/mail/e-mail-shell-backend.c:859
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1007
+#: ../modules/mail/e-mail-shell-backend.c:1151
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:713
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Marking messages as read..."
 msgstr "Merkitään viestejä luetuiksi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
 msgid "Go to Folder"
 msgstr "Siirry kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Refresh list of folders of this account"
 msgstr "Päivitä tämän tilin kansioiden luettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1711
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1758
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 #, fuzzy
 #| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1772
+#: ../modules/mail/e-mail-shell-view-actions.c:1844
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1797
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1953
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1809
-#: ../modules/mail/e-mail-shell-view-actions.c:1830
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1811
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1818
+#: ../modules/mail/e-mail-shell-view-actions.c:1890
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1825
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1858
+#: ../modules/mail/e-mail-shell-view-actions.c:1930
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1865
+#: ../modules/mail/e-mail-shell-view-actions.c:1937
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1872
+#: ../modules/mail/e-mail-shell-view-actions.c:1944
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1874
+#: ../modules/mail/e-mail-shell-view-actions.c:1946
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1951
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1919
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1996
+#: ../modules/mail/e-mail-shell-view-actions.c:2068
+#| msgid "Show Attachment _Bar"
+msgid "Show _Attachment Bar"
+msgstr "Näytä _liitepalkki"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments"
+msgstr "Näytä viestin esikatselu viestiluettelon alla"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 #| msgid "Show _Deleted Messages"
 msgid "Show _Junk Messages"
-msgstr "Näytä _poistetut viestit"
+msgstr "Näytä _roskapostiviestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2086
 #, 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
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2020
+#: ../modules/mail/e-mail-shell-view-actions.c:2100
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 #, 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:2042
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2137
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2144
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../modules/mail/e-mail-shell-view-actions.c:2151
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#: ../modules/mail/e-mail-shell-view-actions.c:2172
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2099
+#: ../modules/mail/e-mail-shell-view-actions.c:2179
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2106
+#: ../modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2113
+#: ../modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2120
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:2200
 #| msgid "Message Header"
 msgid "Message Thread"
-msgstr "Viestin otsakkeet"
+msgstr "Viestinketju"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2180
+#: ../modules/mail/e-mail-shell-view-actions.c:2260
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2190
+#: ../modules/mail/e-mail-shell-view-actions.c:2270
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2197
+#: ../modules/mail/e-mail-shell-view-actions.c:2277
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2204
+#: ../modules/mail/e-mail-shell-view-actions.c:2284
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
@@ -23092,91 +23020,89 @@ msgstr "Etsi kaikilta tileiltä"
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:957
+#: ../modules/mail/e-mail-shell-view-private.c:958
 #, 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:966
-#: ../modules/mail/e-mail-shell-view-private.c:983
+#: ../modules/mail/e-mail-shell-view-private.c:967
+#: ../modules/mail/e-mail-shell-view-private.c:984
 #, 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:992
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:999
 #, 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:1005
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, 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:1011
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, 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:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, 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:1034
-#, fuzzy, c-format
+#: ../modules/mail/e-mail-shell-view-private.c:1035
+#, c-format
 #| msgid "%d unread, "
 #| msgid_plural "%d unread, "
 msgid "%d unread"
 msgid_plural "%d unread"
-msgstr[0] "%d lukematon, "
-msgstr[1] "%d lukematonta, "
+msgstr[0] "%d lukematon"
+msgstr[1] "%d lukematonta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1552
+#: ../modules/mail/e-mail-shell-view-private.c:1553
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../modules/mail/em-composer-prefs.c:414
+#: ../modules/mail/em-composer-prefs.c:413
 msgid "Select Folder to Add"
 msgstr "Valitse lisättävä kansio"
 
-#: ../modules/mail/em-composer-prefs.c:884
+#: ../modules/mail/em-composer-prefs.c:883
 msgid "Folder"
 msgstr "Kansio"
 
-#: ../modules/mail/em-composer-prefs.c:920
+#: ../modules/mail/em-composer-prefs.c:919
 msgid "Recipient"
 msgstr "Vastaanottaja"
 
-#: ../modules/mail/em-composer-prefs.c:1205
+#: ../modules/mail/em-composer-prefs.c:1204
 #, fuzzy
 msgid "Keep in Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../modules/mail/em-composer-prefs.c:1206
-#| msgid "Send private reply?"
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Send immediately"
 msgstr "Lähetä välittömästi"
 
-#: ../modules/mail/em-composer-prefs.c:1207
-#| msgid "15 minutes"
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send after 5 minutes"
 msgstr "Lähetä 5 minuutin jälkeen"
 
-#: ../modules/mail/em-composer-prefs.c:1286
+#: ../modules/mail/em-composer-prefs.c:1285
 msgid "Language(s)"
 msgstr "Kielet"
 
@@ -23234,13 +23160,13 @@ msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti ”%2$s” on luettu."
 msgid "Delivery Notification for \"%s\""
 msgstr "Toimituskuittaus viestille: ”%s”"
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../modules/mdn/evolution-mdn.c:534
 #, fuzzy, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Läh_etä viestin kuittaus:"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "_Ilmoita lähettäjälle"
 
@@ -23306,10 +23232,9 @@ msgid "Display plain text version"
 msgstr "Näytä raakatekstiversio"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
-#, fuzzy
 #| msgid "Display the next important message"
 msgid "Display plain text version of multipart/alternative message"
-msgstr "Näytä seuraava tärkeä viesti"
+msgstr "Näytä raakatekstiversio multipart/alternative-viestistä"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
@@ -23347,10 +23272,9 @@ msgstr ""
 
 #: ../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"
+msgstr "Näytä raakatekstinä jos käytettävissä, tai HTML-lähdekoodi"
 
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
 #: ../modules/prefer-plain/plugin/config-ui.c:47
@@ -23430,9 +23354,8 @@ msgid "I_nclude remote tests"
 msgstr "_Lisää myös etätestit"
 
 #: ../modules/spamassassin/evolution-spamassassin.c:564
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower."
-msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
+msgstr "Tämä tekee SpamAssassinista luotettavamman, mutta hitaamman."
 
 #: ../modules/spamassassin/evolution-spamassassin.c:739
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
@@ -23441,11 +23364,11 @@ msgstr "SpamAssassin"
 
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
-msgstr ""
+msgstr "Roskapostisuodatus SpamAssassinia käyttäen"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Tiedostojen tuonti"
@@ -23474,11 +23397,11 @@ msgstr ""
 msgid "Loading accounts..."
 msgstr "Ladataan tilejä..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
 msgid "_Format as..."
 msgstr "_Muotoile..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
@@ -23699,51 +23622,45 @@ msgid "_VHDL"
 msgstr "_VHDL"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#: ../modules/vcard-inline/e-mail-part-vcard.c:187
 msgid "Show F_ull vCard"
 msgstr "Näytä koko _vCard"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#: ../modules/vcard-inline/e-mail-part-vcard.c:192
 msgid "Show Com_pact vCard"
 msgstr "Näytä tiivistetty vCar_d"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
 msgid "Save _To Addressbook"
 msgstr "Tallenna _osoitekirjaan"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 msgid "There is one other contact."
 msgstr "Löytyi yksi muu yhteystieto."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
 #, fuzzy
 msgid "Addressbook Contact"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
 msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../modules/web-inspector/evolution-web-inspector.c:95
-#, fuzzy
-#| msgid "Evolution Website"
-msgid "Evolution Web Inspector"
-msgstr "Evolutionin www-sivut"
-
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:490
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -23898,7 +23815,7 @@ msgid "Key"
 msgstr "Avaimet"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../plugins/templates/templates.c:499
 msgid "Values"
 msgstr "Arvot"
 
@@ -23932,8 +23849,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:530
-#: ../plugins/external-editor/external-editor.c:532
+#: ../plugins/external-editor/external-editor.c:437
+#: ../plugins/external-editor/external-editor.c:439
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -24047,67 +23964,67 @@ msgstr "Tiedosto ei ole kuvatiedosto"
 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:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 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:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 #, fuzzy
 #| msgid "_Message Source"
 msgid "Copy _Message Archive URL"
 msgstr "_Viestin lähdekoodi"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 #, 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
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 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:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
 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:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
 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:415
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
 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:422
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
 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:431
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -24406,35 +24323,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:1235
+#: ../plugins/mail-to-task/mail-to-task.c:1231
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1242
+#: ../plugins/mail-to-task/mail-to-task.c:1238
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1240
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1249
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1247
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1259
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -24611,7 +24528,7 @@ msgid "_Username:"
 msgstr "Käyttäjät_unnus:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:787
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -24761,6 +24678,10 @@ msgstr "Tallenna valittu muistilappu levylle"
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "Ei otsikkoa"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -24768,53 +24689,54 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1245
-msgid "No Title"
-msgstr "Ei otsikkoa"
+#: ../plugins/templates/templates.c:1286
+#, fuzzy
+msgid "Saving message template"
+msgstr "Tallennetaan viestiä kansioon"
 
-#: ../plugins/templates/templates.c:1354
+#: ../plugins/templates/templates.c:1307
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:1356
+#: ../plugins/templates/templates.c:1309
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
-#: ../shell/e-shell.c:380
+#: ../shell/e-shell.c:381
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:409
+#: ../shell/e-shell.c:410
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/e-shell.c:520
+#: ../shell/e-shell.c:521
 msgid "Preparing to quit"
 msgstr "Valmistellaan sulkemista"
 
-#: ../shell/e-shell.c:526
+#: ../shell/e-shell.c:527
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell.c:1043
+#: ../shell/e-shell.c:1044
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
-#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell.c:1222
+#: ../shell/e-shell.c:1223
 #, fuzzy
 #| msgid "_Quick Reference"
 msgid "Quick _Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "_Lopeta"
 
@@ -24860,7 +24782,7 @@ msgstr "Kaikki tiedostot (*)"
 #: ../shell/e-shell-utils.c:409
 msgid "translator-credits"
 msgstr ""
-"Jiri Grönroos, 2012-2014\n"
+"Jiri Grönroos, 2012-2016\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
@@ -25343,7 +25265,6 @@ msgid "_Close Immediately"
 msgstr "_Sulje välittömästi"
 
 #: ../shell/shell.error.xml.h:14
-#| msgid "Waiting..."
 msgid "Keep _Waiting"
 msgstr "Jatka _odottamista"
 
@@ -25447,72 +25368,60 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Myönnetty organisaatiolle"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Myönnetty organisaatioyksikölle"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Käyttötarkoitus"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Myöntäjä"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Myöntäjäorganisaatio"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Myöntäjä organisaatioyksikkö"
 
-#: ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Myönnetty"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Vanhenemispäivä"
 
-#: ../smime/gui/certificate-manager.c:94
-#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:95
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5-sormenjälki"
@@ -25522,57 +25431,56 @@ msgstr "MD5-sormenjälki"
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:665
 msgid "Select a file to backup your key and certificate..."
-msgstr ""
+msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen..."
 
 #. To Translators:
 #. * %s-backup.p12 is the default file name suggested by the file selection dialog,
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:677
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-varmuuskopio.p12"
 
-#: ../smime/gui/certificate-manager.c:730
-#| msgid "Certificate"
+#: ../smime/gui/certificate-manager.c:743
 msgid "Backup Certificate"
 msgstr "Varmuuskopioi varmenne"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:757
 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
+#: ../smime/gui/certificate-manager.c:762
 msgid "Please select a file..."
 msgstr "Valitse tiedosto..."
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Include certificate chain in the backup"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:782
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:801
 msgid "_Repeat Password:"
 msgstr "_Toista salasana:"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:820
 msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:828
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -25580,101 +25488,100 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:873
 #, fuzzy
 #| msgid "No email address provided"
 msgid "No file name provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../smime/gui/certificate-manager.c:864
-#| msgid "Failed to import certificate"
+#: ../smime/gui/certificate-manager.c:877
 msgid "Failed to backup key and certificate"
 msgstr "Avaimen ja varmenteen varmuuskopiointi epäonnistui"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:966
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1016
 msgid "Failed to import certificate"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1142
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1348
 #, fuzzy
 #| msgid "Certificate Authority Trust"
 msgid "Change certificate trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1360
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Älä koskaan luota tähän varmenteeseen"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1386
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1388
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1389
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1393
 #, fuzzy
 #| msgid ""
 #| "Before trusting this CA for any purpose, you should examine its "
@@ -25686,48 +25593,47 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1408
 msgid "_Display certificate"
 msgstr "_Näytä varmenne"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1613
 #, fuzzy
 #| msgid "You have certificates on file that identify these people:"
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1644
 #, fuzzy
 #| msgid "_List name:"
 msgid "Host name"
 msgstr "_Listan nimi:"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1646
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1647
 msgid "Fingerprint"
 msgstr "Sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1648
 msgid "Trust"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:1656
-#| msgid "_Edit CA Trust"
+#: ../smime/gui/certificate-manager.c:1669
 msgid "_Edit Trust"
 msgstr "_Muokkaa luottamusta"
 
-#: ../smime/gui/certificate-manager.c:1977
+#: ../smime/gui/certificate-manager.c:2123
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:1994
+#: ../smime/gui/certificate-manager.c:2140
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:2011
+#: ../smime/gui/certificate-manager.c:2157
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
@@ -25988,6 +25894,73 @@ msgstr "_Eräpäivän kanssa"
 msgid "With _Status"
 msgstr "_Tilan kanssa"
 
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
+
+#~ msgid "OUTPUTFILE"
+#~ msgstr "TULOSTIEDOSTO"
+
+#~ msgid "List local address book folders"
+#~ msgstr "Näytä paikalliset osoitekirjakansiot"
+
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "Nämä kortit vcard- tai cvs-tiedostoina"
+
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|cvs]"
+
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr ""
+#~ "Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi "
+#~ "käyttöohjeet."
+
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
+
+#~ msgid "Unhandled error"
+#~ msgstr "Käsittelemätön virhe"
+
+#, fuzzy
+#~ msgid "Failed to open client '%s': %s"
+#~ msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+
+#~ msgid "Canceled"
+#~ msgstr "Peruutettu"
+
+#~| msgid "Canceled"
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "Peruttu"
+
+#~| msgid "Enable express mode"
+#~ msgid "Enable developer mode"
+#~ msgstr "Ota kehittäjätila käyttöön"
+
+#~ msgid "Signature exists, but need public key"
+#~ msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
+
+#, fuzzy
+#~| msgid "Calendar Properties"
+#~ msgid "Changed property"
+#~ msgstr "Kalenterin ominaisuudet"
+
+#, fuzzy
+#~| msgid "Whether to show the preview pane."
+#~ msgid "Whether editor changed"
+#~ msgstr "Näytetäänkö esikatselupaneeli."
+
+#~ msgid "_Unsort"
+#~ msgstr "Poista _järjestys"
+
+#~ msgid "Canceled."
+#~ msgstr "Peruttu."
+
+#, fuzzy
+#~| msgid "Evolution Website"
+#~ msgid "Evolution Web Inspector"
+#~ msgstr "Evolutionin www-sivut"
+
 #~ msgid "Edit Reminder"
 #~ msgstr "Muokkaa muistutusta"
 


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