[evolution] Update Finnish translation



commit 90edc92e5f17db7da0c88ad6cb5aff1e2785cb65
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Sat Sep 7 13:42:22 2019 +0000

    Update Finnish translation

 po/fi.po | 6328 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 3527 insertions(+), 2801 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 25ab9930dc..c47017f3dd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-02-08 18:38+0000\n"
-"PO-Revision-Date: 2019-02-23 21:12+0200\n"
+"POT-Creation-Date: 2019-08-26 13:09+0000\n"
+"PO-Revision-Date: 2019-09-07 16:41+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -547,15 +547,12 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "Kuinka monta yksikköä tarvitaan, jotta tehtävät piilotetaan."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#, fuzzy
-#| msgid "Hide cancelled tasks"
 msgid "Hide cancelled events"
-msgstr "Piilota perutut tehtävät"
+msgstr "Piilota perutut tapahtumat"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#, fuzzy
 msgid "Whether to hide cancelled events in the calendar view"
-msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
+msgstr "Piilotetaanko peruutetut tapahtumat kalenterinäkymässä"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Hide cancelled tasks"
@@ -964,20 +961,26 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 #, fuzzy
+#| msgid "Default reminder value"
+msgid "User-defined reminder times, in minutes"
+msgstr "Muistutuksen oletusarvo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#, fuzzy
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “week-"
 "start-day-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(Vanhennettu) Työpäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key was "
 "deprecated in version 3.10 and should no longer be used. Use the “work-day-"
@@ -1365,7 +1368,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid "Include signature in new messages only"
-msgstr ""
+msgstr "Sisällytä allekirjoitus vain uusiin viesteihin"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid ""
@@ -2651,59 +2654,71 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 #, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Whether display delivery notification parts inline."
+msgstr "Näytä muistutukset vain _ilmoitusalueella"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+msgid ""
+"If enabled, the message/delivery-status and message/disposition-notification parts "
+"are shown automatically inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 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:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 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:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 #, 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:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 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:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 #, 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:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 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:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 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:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
@@ -2850,6 +2865,16 @@ msgstr "Poista käsitellyt"
 msgid "Whether to delete processed iTip objects"
 msgstr ""
 
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "Preserve existing reminder by default"
+msgstr "_Säilytä oma muistutus"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
+msgid "Whether to preset option to preserve existing reminder by default"
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Huomauta uusista viesteistä vain saapuvien kansiossa."
@@ -3029,7 +3054,7 @@ msgstr ""
 msgid "Compression filter used when compressing attached directories with autoar."
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:318
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -3194,10 +3219,8 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
-#, fuzzy
-#| msgid "Whether the toolbar should be visible."
 msgid "Whether the text-highlight module is enabled"
-msgstr "Näytetäänkö työkalupalkki."
+msgstr "Onko tekstin korostusmoduuli käytössä"
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
 msgid "Theme name to use, defaults to “bclear”"
@@ -3211,7 +3234,7 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
-#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1224
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1252
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
@@ -3243,14 +3266,8 @@ msgstr ""
 "palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
-#, fuzzy
-#| msgid ""
-#| "Thanks\n"
-#| "The Evolution Team\n"
 msgid "The Evolution Team"
-msgstr ""
-"Kiitos\n"
-"Evolution-tiimi\n"
+msgstr "Evolution-tiimi"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:352
 msgid "Groupware Suite"
@@ -3282,11 +3299,11 @@ msgid "Contacts"
 msgstr "Yhteystiedot"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:784 ../src/e-util/e-send-options.c:544
-#: ../src/e-util/e-webdav-browser.c:469
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:954
+#: ../src/e-util/e-collection-account-wizard.c:816 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-webdav-browser.c:470
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:604
+#: ../src/modules/calendar/e-cal-shell-view.c:599
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Kalenteri"
@@ -3295,14 +3312,14 @@ msgstr "Kalenteri"
 #: ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1483
+#: ../src/modules/mail/e-mail-shell-view.c:1493
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Sähköposti"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1736
+#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-cal-shell-content.c:1763
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3310,18 +3327,258 @@ msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2417
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2426
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1109
-#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/calendar/importers/icalendar-importer.c:1141
+#: ../src/e-util/e-webdav-browser.c:461
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:71
-#: ../src/modules/calendar/e-cal-shell-content.c:1696
+#: ../src/modules/calendar/e-cal-shell-content.c:1723
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:507
+#: ../src/modules/calendar/e-task-shell-view.c:508
 msgid "Tasks"
 msgstr "Tehtävät"
 
+#: ../data/ui/evolution-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
+
+#: ../data/ui/evolution-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Yleiset"
+
+#: ../data/ui/evolution-shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Select Mail component"
+msgstr "Valitse sähköposti"
+
+#: ../data/ui/evolution-shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Select Contacts component"
+msgstr "Valitse yhteystiedot"
+
+#: ../data/ui/evolution-shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Select Calendar component"
+msgstr "Valitse kalenteri"
+
+#: ../data/ui/evolution-shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Select Tasks component"
+msgstr "Valitse tehtävät"
+
+#: ../data/ui/evolution-shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Select Memos component"
+msgstr "Valitse muistilaput"
+
+#: ../data/ui/evolution-shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Create a new item in current component"
+msgstr "Luo uusi tietue nykyisessä näkymässä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Cycle focus between panes"
+msgstr "Vaihda eri paneelien välillä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Open the Evolution user guide"
+msgstr "Avaa Evolutionin käyttäjäohje"
+
+#: ../data/ui/evolution-shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Clear search bar"
+msgstr "Tyhjennä haku"
+
+#: ../data/ui/evolution-shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move mails or contacts to folder"
+msgstr "Siirrä sähköpostit tai yhteystiedot kansioon"
+
+#: ../data/ui/evolution-shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Copy mails or contacts to folder"
+msgstr "Kopioi sähköpostit tai yhteystiedot kansioon"
+
+#: ../data/ui/evolution-shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../data/ui/evolution-shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Open new window"
+msgstr "Avaa uusi ikkuna"
+
+#: ../data/ui/evolution-shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "Sulje ikkuna"
+
+#: ../data/ui/evolution-shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Quit Evolution"
+msgstr "Lopeta Evolution"
+
+#: ../data/ui/evolution-shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Mail"
+msgstr "Sähköposti"
+
+#: ../data/ui/evolution-shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Create a new message"
+msgstr "Luo uusi viesti"
+
+#: ../data/ui/evolution-shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Send and receive messages"
+msgstr "Lähetä ja vastaanota viestejä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Apply filters to selection"
+msgstr "Toteuta suodattimet valinnalle"
+
+#: ../data/ui/evolution-shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Open selection in new window"
+msgstr "Avaa valinta uudessa ikkunassa"
+
+#: ../data/ui/evolution-shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Go to folder"
+msgstr "Siirry kansioon"
+
+#: ../data/ui/evolution-shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Mark selected messages as read"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ../data/ui/evolution-shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Mark selected messages as unread"
+msgstr "Merkitse valitut viestit lukemattomiksi"
+
+#: ../data/ui/evolution-shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Jump to the next unread message"
+msgstr "Siirry seuraavaan lukemattomaan viestiin"
+
+#: ../data/ui/evolution-shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "Jump to the previous unread message"
+msgstr "Siirry edelliseen lukemattomaan viestiin"
+
+#: ../data/ui/evolution-shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Forward selected messages"
+msgstr "Välitä valitut viestit"
+
+#: ../data/ui/evolution-shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "Vastaa lähettäjälle"
+
+#: ../data/ui/evolution-shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Reply to list"
+msgstr "Vastaa listalle"
+
+#: ../data/ui/evolution-shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Reply to all recipients"
+msgstr "Vastaa kaikille vastaanottajille"
+
+#: ../data/ui/evolution-shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Scroll up"
+msgstr "Vieritä ylös"
+
+#: ../data/ui/evolution-shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Scroll down"
+msgstr "Vieritä alas"
+
+#: ../data/ui/evolution-shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: ../data/ui/evolution-shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: ../data/ui/evolution-shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Create a new meeting"
+msgstr "Luo uusi kokous"
+
+#: ../data/ui/evolution-shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Create a new task"
+msgstr "Luo uusi tehtävä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Create a new memo"
+msgstr "Luo uusi muistilappu"
+
+#: ../data/ui/evolution-shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Go to today"
+msgstr "Siirry tähän päivään"
+
+#: ../data/ui/evolution-shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Go to date"
+msgstr "Siirry päivään"
+
+#: ../data/ui/evolution-shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Day View"
+msgstr "Päivänäkymä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Work Week View"
+msgstr "Työviikkonäkymä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Week View"
+msgstr "Viikkonäkymä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Month View"
+msgstr "Kuukausinäkymä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "List View"
+msgstr "Luettelonäkymä"
+
+#: ../data/ui/evolution-shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../data/ui/evolution-shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Create a new contact"
+msgstr "Luo uusi yhteystieto"
+
+#: ../data/ui/evolution-shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Create a new contact list"
+msgstr "Luo uusi yhteystietoluettelo"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Osoitekortit"
@@ -3382,11 +3639,11 @@ msgstr "Le_veälle näkymälle"
 msgid "As Sent Folder for Wi_de View"
 msgstr "Lähetetyt-kansion mukaan _leveässä näkymässä"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
 msgid "_Memos"
 msgstr "_Muistilaput"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tehtävät"
@@ -3502,30 +3759,34 @@ msgid "The image you have selected is large. Do you want to resize and store it?
 msgstr "Valitsemasi kuva on suuri. Haluatko muuttaa kuvan kokoa ja tallentaa sen?"
 
 #: ../src/addressbook/addressbook.error.xml.h:24
+msgid "An expected image size is up to 96 x 96 pixels."
+msgstr ""
+
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Resize"
 msgstr "_Muuta kokoa"
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Use as it is"
 msgstr "Käytä _sellaisenaan"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Do not save"
 msgstr "Ä_lä tallenna"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Unable to save {0}."
 msgstr "{0} ei voi tallentaa."
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Virhe tallennettaessa {0} kohteeseen {1}: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Address “{0}” already exists."
 msgstr "Osoite “{0}” on jo olemassa."
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid ""
 "A contact already exists with this address. Would you like to add a new card with "
 "the same address anyway?"
@@ -3533,29 +3794,29 @@ msgstr ""
 "Tälle osoitteelle on jo yhteystieto. Haluatko lisätä uuden yhteystiedon samalla "
 "osoitteella?"
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:751
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
 #: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:719 ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1044 ../src/mail/em-vfolder-editor-rule.c:408
+#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1330 ../src/mail/em-vfolder-editor-rule.c:408
 #: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
 #: ../src/modules/mail/em-composer-prefs.c:423
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:838
+#: ../src/plugins/email-custom-header/email-custom-header.c:839
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid "Some addresses already exist in this contact list."
 msgstr "Jotkin osoitteet ovat jo olemassa tässä yhteystietoluettelossa."
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are trying to add addresses that are part of this list already. Would you like "
 "to add them anyway?"
@@ -3563,19 +3824,19 @@ msgstr ""
 "Olet lisäämässä osoitteita, jotka ovat jo tässä luettelossa. Haluatko lisätä ne "
 "silti?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Skip duplicates"
 msgstr "Ohita kaksoiskappaleet"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "Add with duplicates"
 msgstr "Lisää kaksoiskappaleineen"
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "List “{0}” is already in this contact list."
 msgstr "Luettelo “{0}” on jo tässä yhteystietoluettelossa."
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like to add "
 "it anyway?"
@@ -3583,21 +3844,21 @@ msgstr ""
 "Yhteystieto nimellä “{0}” on jo tässä yhteystietoluettelossa. Haluatko lisätä sen "
 "silti?"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Oikeutesi eivät riitä yhteystietojen poistamiseen tästä osoitekirjasta."
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:41
 msgid "Cannot add new contact"
 msgstr "Uutta yhteystietoa ei voi lisätä"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -3605,12 +3866,12 @@ msgstr ""
 "“{0}” on vain luettavissa oleva osoitekirja eikä sitä voi muokata. Valitse "
 "yhteystietonäkymän sivupalkista toinen osoitekirja."
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:44
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Yhteystiedon tallennus ei onnistu, osoitekirja avautuu edelleen"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still opening. "
 "Either wait till it’s opened, or select a different address book."
@@ -3618,38 +3879,36 @@ msgstr ""
 "Yhteystiedon tallennus osoitekirjaan “{0}” ei onnistu, koska osoitekirja avautuu "
 "edelleen. Odota sen avautumista, tai valitse toinen osoitekirja."
 
-#: ../src/addressbook/addressbook.error.xml.h:46
-#, fuzzy
-#| msgid "Search for text in the displayed contact"
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid "Something has gone wrong when displaying the contact"
-msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
+msgstr "Jokin meni pieleen yhteytietoa näyttäessä"
 
-#: ../src/addressbook/addressbook.error.xml.h:47
+#: ../src/addressbook/addressbook.error.xml.h:48
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:49
 #, fuzzy
 #| msgid "Failed to refresh address book “{0}”"
 msgid "Failed to refresh list of account address books"
 msgstr "Osoitekirjan “{0}” päivittäminen epäonnistui"
 
-#: ../src/addressbook/addressbook.error.xml.h:49
+#: ../src/addressbook/addressbook.error.xml.h:50
 #, fuzzy
 #| msgid "Do you want to recover unfinished messages?"
 msgid "Do you want to unset contact image?"
 msgstr "Haluatko palauttaa viimeistelemättömät viestit?"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:51
 #, fuzzy
 #| msgid "Do _Not Unsubscribe"
 msgid "Do _Not Unset"
 msgstr "_Älä peru tilausta"
 
-#: ../src/addressbook/addressbook.error.xml.h:51
+#: ../src/addressbook/addressbook.error.xml.h:52
 #, fuzzy
 #| msgid "_Unsort"
 msgid "_Unset"
@@ -3712,14 +3971,14 @@ msgid "Show Certificates"
 msgstr "Näytä varmenteet"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:726
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:748
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Asetukset"
@@ -3727,29 +3986,29 @@ msgstr "Asetukset"
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:510
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:746
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
-#: ../src/calendar/gui/e-cal-dialogs.c:694
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668 ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:171
-#: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:231
-#: ../src/e-util/e-collection-account-wizard.c:1801
-#: ../src/e-util/e-collection-account-wizard.c:2037
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
+#: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:238
+#: ../src/e-util/e-collection-account-wizard.c:1838
+#: ../src/e-util/e-collection-account-wizard.c:2074
 #: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:304
 #: ../src/e-util/e-html-editor-actions.c:348
@@ -3761,10 +4020,10 @@ msgstr "Asetukset"
 #: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:360
 #: ../src/e-util/e-source-selector-dialog.c:370 ../src/e-util/e-table-config.c:548
 #: ../src/e-util/e-table-config.ui.h:3 ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4347
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4175
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4047
 #: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
@@ -3772,7 +4031,7 @@ msgstr "Asetukset"
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:936
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
-#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -3789,14 +4048,14 @@ msgid "_Cancel"
 msgstr "_Peru"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
-#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:749
+#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2158
 #: ../src/composer/e-composer-actions.c:228 ../src/composer/e-composer-actions.c:340
 #: ../src/e-util/e-attachment-store.c:848 ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:4347
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
 #: ../src/smime/gui/certificate-manager.c:651
@@ -3805,15 +4064,15 @@ msgid "_Save"
 msgstr "_Tallenna"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2012 ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/calendar/gui/e-comp-editor.c:2055 ../src/calendar/gui/e-comp-editor.c:2127
 #: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1458 ../src/shell/e-shell-window-actions.c:994
+#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:1019
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3559
+#: ../src/e-util/e-misc-utils.c:3573
 msgid "Image"
 msgstr "Kuva"
 
@@ -3839,8 +4098,8 @@ msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1291
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Sähköposti"
@@ -3871,8 +4130,8 @@ msgid "_Home Page:"
 msgstr "K_otisivu:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:835
-#: ../src/modules/itip-formatter/itip-view.c:2049
+#: ../src/calendar/gui/e-comp-editor-event.c:870
+#: ../src/modules/itip-formatter/itip-view.c:2071
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -3960,16 +4219,16 @@ msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2079
+#: ../src/calendar/gui/e-calendar-view.c:2098
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2078
+#: ../src/calendar/gui/e-calendar-view.c:2097
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -4018,16 +4277,16 @@ msgstr "Koti"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:969
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Työ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1035
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Other"
 msgstr "Muut"
 
@@ -4051,16 +4310,16 @@ msgstr "Lisää _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037 ../src/e-util/filter.error.xml.h:18
-#: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.error.xml.h:18
+#: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:872
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1050 ../src/mail/em-vfolder-editor-rule.c:642
+#: ../src/mail/em-folder-properties.c:1336 ../src/mail/em-vfolder-editor-rule.c:642
 #: ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:848
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
 #: ../src/plugins/templates/templates.c:474
@@ -4081,22 +4340,22 @@ msgid "Certificates"
 msgstr "Varmenteet"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2047 ../src/e-util/e-html-editor-actions.c:945
+#: ../src/calendar/gui/e-comp-editor.c:2090 ../src/e-util/e-html-editor-actions.c:945
 msgid "_Undo"
 msgstr "_Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2054 ../src/e-util/e-html-editor-actions.c:931
+#: ../src/calendar/gui/e-comp-editor.c:2097 ../src/e-util/e-html-editor-actions.c:931
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Tee uudelleen"
 
@@ -4113,38 +4372,38 @@ msgstr "Virhe muokattaessa yhteystietoa"
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:742
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Yhteystietojen muokkain — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3239
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid "X.509 certificates"
 msgstr "X.509-varmenteet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3244
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
 msgid "PGP keys"
 msgstr "PGP-avaimet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
 #: ../src/smime/gui/certificate-manager.c:672
 #: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open PGP key"
 msgstr "Avaa PGP-avain"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open X.509 certificate"
 msgstr "Avaa X.509-varmenne"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
-#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:179
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
 #: ../src/e-util/e-html-editor-actions.c:304
 #: ../src/e-util/e-html-editor-actions.c:348
 #: ../src/e-util/e-html-editor-actions.c:430
@@ -4153,49 +4412,49 @@ msgstr "Avaa X.509-varmenne"
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3515
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
 msgid "Chosen file is not a local file."
 msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3300
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Varmenteen lataaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save PGP key"
 msgstr "Tallenna PGP-avain"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save X.509 certificate"
 msgstr "Tallenna X.509-varmenne"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3527
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Varmenteen tallentaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4331
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4702
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4203,28 +4462,28 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4722
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "“%s” ei voi olla tuleva päivä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4730
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4737
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4751
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4743
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4757
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” on tyhjä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4766
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4772
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -4232,11 +4491,11 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
 #: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
-#: ../src/e-util/e-category-editor.c:260 ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-category-editor.c:258 ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:255 ../src/e-util/e-passwords.c:469
+#: ../src/e-util/e-html-editor-link-dialog.c:243 ../src/e-util/e-passwords.c:469
 #: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:188
 #: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:934
 #: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:361
@@ -4388,12 +4647,12 @@ msgid "_Top"
 msgstr "Ylimm_äiseksi"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3474 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Ylös"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3476 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Alas"
 
@@ -4436,9 +4695,9 @@ msgstr "Sähköposti alkaa"
 #: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:809
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1017
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:807
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -4459,8 +4718,8 @@ msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
 #: ../src/e-util/e-web-view.c:440
-msgid "_Send New Message To..."
-msgstr "Lähetä uusi _viesti..."
+msgid "_Send New Message To…"
+msgstr "Lähetä uusi _viesti…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
 #: ../src/e-util/e-web-view.c:442
@@ -4468,7 +4727,7 @@ msgid "Send a mail message to this address"
 msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1441
+#: ../src/e-util/e-web-view.c:1446
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -4483,178 +4742,169 @@ msgstr "Napsauta avataksesi %s"
 msgid "Open map"
 msgstr "Avaa kartta"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
 msgid "List Members:"
 msgstr "Luettelon jäsenet:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
+msgid "Phone"
+msgstr "Puhelin"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:883
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:884
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Asema"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:952
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Apulainen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:955
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
-msgid "Phone"
-msgstr "Puhelin"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:957
 msgid "Fax"
 msgstr "Fax"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:959
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1025
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
-#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1012
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1057
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1253
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1276
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1317
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1327
 msgid "Blog"
 msgstr "Blogi"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:322
-#: ../src/calendar/gui/e-cal-model-tasks.c:272
-#: ../src/calendar/gui/e-cal-model-tasks.c:526 ../src/calendar/gui/e-task-table.c:210
-#: ../src/calendar/gui/e-task-table.c:225 ../src/calendar/gui/e-task-table.c:635
-#: ../src/calendar/gui/print.c:3600 ../src/calendar/gui/tasktypes.xml.in.h:14
-#: ../src/mail/mail-send-recv.c:1146
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:299
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:489
 msgid "Merge Contact"
 msgstr "Yhdistä yhteystieto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:511
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:741
 msgid "Duplicate Contact Detected"
 msgstr "Päällekkäisiä yhteystietoja havaittu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:799
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -4662,7 +4912,7 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko tallentaa muutokset joka tapauksessa?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:802
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -4670,19 +4920,19 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:817
 msgid "Changed Contact:"
 msgstr "Muutettu yhteystieto:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:819
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:858
 msgid "Conflicting Contact:"
 msgstr "Ristiriitainen yhteystieto:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:860
 msgid "Old Contact:"
 msgstr "Vanha yhteystieto:"
 
@@ -4820,69 +5070,69 @@ msgstr "Haku keskeytettiin"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
 msgid "Are you sure you want to delete this contact?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2005 ../src/e-util/e-accounts-window.c:1753
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-accounts-window.c:1753
 #: ../src/e-util/e-focus-tracker.c:783 ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2688 ../src/mail/e-mail-account-manager.c:737
+#: ../src/e-util/e-webdav-browser.c:2697 ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:699
-#: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:697
+#: ../src/modules/calendar/e-task-shell-view-actions.c:851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
+#: ../src/shell/e-shell-window-actions.c:877
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Poista"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -4897,11 +5147,11 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää nämä kaikki yhteystiedot?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don’t Display"
 msgstr "Ä_lä näytä"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -4969,6 +5219,10 @@ msgstr "Faksi kotiin"
 msgid "ISDN Phone"
 msgstr "ISDN-numero"
 
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Muu puhelin"
@@ -5012,7 +5266,7 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:671
+#: ../src/calendar/gui/e-meeting-list-view.c:664
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
@@ -5075,15 +5329,15 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2862
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:2015
-#: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/e-util/e-html-editor-find-dialog.c:244
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "_Find"
 msgstr "_Etsi"
 
@@ -5091,11 +5345,11 @@ msgstr "_Etsi"
 msgid ""
 "\n"
 "\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
 msgstr ""
 "\n"
 "\n"
-"Etsitään yhteystietoja..."
+"Etsitään yhteystietoja…"
 
 #: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
@@ -5145,46 +5399,45 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:749
+#: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:478
-#: ../src/calendar/importers/icalendar-importer.c:971
-#: ../src/calendar/importers/icalendar-importer.c:1011
-#: ../src/shell/shell.error.xml.h:1
-msgid "Importing..."
-msgstr "Tuodaan..."
+#: ../src/calendar/importers/icalendar-importer.c:499
+#: ../src/calendar/importers/icalendar-importer.c:1003
+#: ../src/calendar/importers/icalendar-importer.c:1043
+msgid "Importing…"
+msgstr "Tuodaan…"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:931
+#: ../src/addressbook/importers/evolution-csv-importer.c:978
 msgid "Can’t open .csv file"
 msgstr ".csv-tiedostoa ei voi avata"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1100
+#: ../src/addressbook/importers/evolution-csv-importer.c:1151
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1101
+#: ../src/addressbook/importers/evolution-csv-importer.c:1152
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1109
+#: ../src/addressbook/importers/evolution-csv-importer.c:1160
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1110
+#: ../src/addressbook/importers/evolution-csv-importer.c:1161
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1118
+#: ../src/addressbook/importers/evolution-csv-importer.c:1169
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1119
+#: ../src/addressbook/importers/evolution-csv-importer.c:1170
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
@@ -5354,7 +5607,7 @@ msgstr "Älä läh_etä"
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../src/calendar/calendar.error.xml.h:5 ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/calendar.error.xml.h:5 ../src/calendar/gui/e-cal-dialogs.c:504
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
@@ -5371,7 +5624,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että tehtävä on "
 "peruttu."
 
-#: ../src/calendar/calendar.error.xml.h:9 ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/calendar.error.xml.h:9 ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Haluatko varmasti poistaa tämän tehtävän?"
@@ -5392,7 +5645,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "muistilappu on poistettu."
 
-#: ../src/calendar/calendar.error.xml.h:13 ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/calendar.error.xml.h:13 ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
@@ -6084,7 +6337,7 @@ msgstr ""
 #: ../src/calendar/gui/e-memo-table.etspec.h:2
 #: ../src/calendar/gui/e-task-table.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:1 ../src/calendar/gui/tasktypes.xml.in.h:1
-#: ../src/plugins/save-calendar/csv-format.c:373
+#: ../src/plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -6104,7 +6357,7 @@ msgstr "ei sisällä"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:4 ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1893
+#: ../src/e-util/e-collection-account-wizard.c:1930
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6131,20 +6384,20 @@ msgstr "on"
 msgid "is not"
 msgstr "ei ole"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:243
-#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:523 ../src/calendar/gui/memotypes.xml.in.h:10
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:263
+#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
+#: ../src/calendar/gui/e-task-table.c:445 ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:244
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:264
+#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:245
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:265
+#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
@@ -6166,7 +6419,7 @@ msgstr "Osanottaja"
 #: ../src/calendar/gui/e-task-table.etspec.h:13 ../src/mail/message-list.etspec.h:14
 #: ../src/plugins/publish-calendar/publish-calendar.c:861
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../src/plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Sijainti"
 
@@ -6179,7 +6432,7 @@ msgstr "Luokka"
 #: ../src/calendar/gui/caltypes.xml.in.h:16 ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
 #: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/em-format/e-mail-formatter-print-headers.c:161
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
@@ -6198,7 +6451,7 @@ msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -6228,19 +6481,69 @@ msgstr "Yhteenveto sisältää"
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2366
+#: ../src/calendar/gui/comp-util.c:1544
+#: ../src/modules/itip-formatter/itip-view.c:2391
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/comp-util.c:1546
+#: ../src/calendar/gui/comp-util.c:1603
 #, c-format
 msgid "Comments: %s"
 msgstr "Kommentit: %s"
 
+#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+msgctxt "iCalendarStatus"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../src/calendar/gui/comp-util.c:1618
+msgctxt "iCalendarStatus"
+msgid "Tentative"
+msgstr "Alustava"
+
+#: ../src/calendar/gui/comp-util.c:1619
+msgctxt "iCalendarStatus"
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#: ../src/calendar/gui/comp-util.c:1621
+msgctxt "iCalendarStatus"
+msgid "Draft"
+msgstr "Luonnos"
+
+#: ../src/calendar/gui/comp-util.c:1622
+msgctxt "iCalendarStatus"
+msgid "Final"
+msgstr ""
+
+#: ../src/calendar/gui/comp-util.c:1623
+msgctxt "iCalendarStatus"
+msgid "Not Started"
+msgstr "Ei aloitettu"
+
+#: ../src/calendar/gui/comp-util.c:1624
+msgctxt "iCalendarStatus"
+msgid "Needs Action"
+msgstr "Vaatii toimenpiteitä"
+
+#: ../src/calendar/gui/comp-util.c:1625
+msgctxt "iCalendarStatus"
+msgid "In Progress"
+msgstr "Työn alla"
+
+#: ../src/calendar/gui/comp-util.c:1626
+msgctxt "iCalendarStatus"
+msgid "Completed"
+msgstr "Valmis"
+
+#: ../src/calendar/gui/comp-util.c:1627
+msgctxt "iCalendarStatus"
+msgid "Cancelled"
+msgstr "Peruttu"
+
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
@@ -6342,83 +6645,42 @@ 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"
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d päivä"
-msgstr[1] "%d päivää"
+#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:387
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "Toista ääni"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../src/calendar/gui/e-alarm-list.c:374
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d viikko"
-msgstr[1] "%d viikkoa"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:391
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "Ponnahdusikkuna hälytykselle"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tunti"
-msgstr[1] "%d tuntia"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuutti"
-msgstr[1] "%d minuuttia"
-
-#. 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")
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunti"
-msgstr[1] "%d sekuntia"
-
-#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1820
-msgctxt "cal-reminders"
-msgid "Play a sound"
-msgstr "Toista ääni"
-
-#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1818
-msgctxt "cal-reminders"
-msgid "Pop up an alert"
-msgstr "Ponnahdusikkuna hälytykselle"
-
-#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1824
-msgctxt "cal-reminders"
-msgid "Send an email"
-msgstr "Lähetä sähköposti"
+#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:395
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "Lähetä sähköposti"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1822
+#: ../src/calendar/gui/e-alarm-list.c:399
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
-#: ../src/calendar/gui/e-alarm-list.c:437
+#: ../src/calendar/gui/e-alarm-list.c:405
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:452
+#: ../src/calendar/gui/e-alarm-list.c:421
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
@@ -6426,7 +6688,7 @@ msgstr "%s %s ennen alkua"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:458
+#: ../src/calendar/gui/e-alarm-list.c:427
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
@@ -6434,7 +6696,7 @@ msgstr "%s %s alun jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:465
+#: ../src/calendar/gui/e-alarm-list.c:434
 #, fuzzy, c-format
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
@@ -6443,7 +6705,7 @@ msgstr "Liite: %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:477
+#: ../src/calendar/gui/e-alarm-list.c:447
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
@@ -6451,7 +6713,7 @@ msgstr "%s %s ennen loppumista"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:483
+#: ../src/calendar/gui/e-alarm-list.c:453
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
@@ -6459,7 +6721,7 @@ msgstr "%s %s päättymisen jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:490
+#: ../src/calendar/gui/e-alarm-list.c:460
 #, fuzzy, c-format
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
@@ -6468,7 +6730,7 @@ msgstr "Liite: %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../src/calendar/gui/e-alarm-list.c:514
+#: ../src/calendar/gui/e-alarm-list.c:484
 #, fuzzy, c-format
 #| msgid "%s at %s"
 msgctxt "cal-reminders"
@@ -6477,7 +6739,7 @@ msgstr "%s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../src/calendar/gui/e-alarm-list.c:522
+#: ../src/calendar/gui/e-alarm-list.c:492
 #, fuzzy, c-format
 #| msgid "%s for an unknown trigger type"
 msgctxt "cal-reminders"
@@ -6502,295 +6764,276 @@ msgstr "kalenterin kuukausinäkymä"
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:216
+#: ../src/calendar/gui/e-cal-component-preview.c:237
 #: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:224
+#: ../src/calendar/gui/e-cal-component-preview.c:251
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:258
+#: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1793
+#: ../src/modules/itip-formatter/itip-view.c:1677
+#: ../src/modules/itip-formatter/itip-view.c:1788
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:266
+#: ../src/calendar/gui/e-cal-component-preview.c:295
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:277
+#: ../src/calendar/gui/e-cal-component-preview.c:304
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/calendar/gui/e-cal-component-preview.c:313
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:300
+#: ../src/calendar/gui/e-cal-component-preview.c:326
 #, fuzzy
 #| msgid "Recurring"
 msgid "Recurs:"
 msgstr "Toistuva"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1802
+#: ../src/calendar/gui/e-cal-component-preview.c:338
+#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:1797
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:316
-#: ../src/calendar/gui/e-cal-model-tasks.c:268
-#: ../src/calendar/gui/e-cal-model-tasks.c:522
-#: ../src/calendar/gui/e-cal-model-tasks.c:603 ../src/calendar/gui/e-task-table.c:206
-#: ../src/calendar/gui/e-task-table.c:221 ../src/calendar/gui/e-task-table.c:633
-#: ../src/calendar/gui/print.c:3594
-msgid "In Progress"
-msgstr "Työn alla"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:319
-#: ../src/calendar/gui/e-cal-model-tasks.c:270
-#: ../src/calendar/gui/e-cal-model-tasks.c:524
-#: ../src/calendar/gui/e-meeting-store.c:205
-#: ../src/calendar/gui/e-meeting-store.c:228 ../src/calendar/gui/e-task-table.c:208
-#: ../src/calendar/gui/e-task-table.c:223 ../src/calendar/gui/e-task-table.c:634
-#: ../src/calendar/gui/print.c:3597 ../src/calendar/gui/tasktypes.xml.in.h:13
-#: ../src/plugins/save-calendar/csv-format.c:377
-msgid "Completed"
-msgstr "Valmis"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:326
-#: ../src/calendar/gui/e-cal-model-tasks.c:266
-#: ../src/calendar/gui/e-cal-model-tasks.c:520 ../src/calendar/gui/e-task-table.c:204
-#: ../src/calendar/gui/e-task-table.c:219 ../src/calendar/gui/e-task-table.c:632
-#: ../src/calendar/gui/print.c:3591 ../src/calendar/gui/tasktypes.xml.in.h:11
-msgid "Not Started"
-msgstr "Ei aloitettu"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:339
-msgid "Priority:"
-msgstr "Prioriteetti:"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:341
-#: ../src/calendar/gui/e-task-table.c:549 ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:328
+#: ../src/calendar/gui/e-cal-component-preview.c:347
+#: ../src/calendar/gui/e-task-table.c:471 ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:331
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:343
-#: ../src/calendar/gui/e-cal-model.c:1911 ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-cal-model.c:1872 ../src/calendar/gui/e-task-table.c:472
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:327
+#: ../src/mail/message-list.c:330
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:345
-#: ../src/calendar/gui/e-task-table.c:551 ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:326
+#: ../src/calendar/gui/e-cal-component-preview.c:351
+#: ../src/calendar/gui/e-task-table.c:473 ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:329
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:364
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+msgid "Priority:"
+msgstr "Prioriteetti:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:365
+msgid "Organizer:"
+msgstr "Järjestäjä:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:406
+#, fuzzy
+#| msgid "Attendees: "
+msgid "Attendees:"
+msgstr "Osanottajat: "
+
+#: ../src/calendar/gui/e-cal-component-preview.c:453
 #: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:395
+#: ../src/calendar/gui/e-cal-component-preview.c:507
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1709
+#: ../src/calendar/gui/e-cal-data-model.c:1753
 #, fuzzy, c-format
 #| msgid "Opening calendar '%s'"
 msgid "Creating view for calendar “%s”"
 msgstr "Avataan kalenteria %s"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1713
+#: ../src/calendar/gui/e-cal-data-model.c:1757
 #, fuzzy, c-format
 #| msgid "Opening task list '%s'"
 msgid "Creating view for task list “%s”"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1717
+#: ../src/calendar/gui/e-cal-data-model.c:1761
 #, fuzzy, c-format
 #| msgid "Opening memo list '%s'"
 msgid "Creating view for memo list “%s”"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1964
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:299
-#, fuzzy, c-format
-#| msgid "Copying events to the calendar '%s'"
+#: ../src/calendar/gui/e-cal-dialogs.c:297
+#, c-format
 msgid "Copying events to the calendar “%s”"
-msgstr "Kopioidaan tapahtumia kalenteriin '%s'"
+msgstr "Kopioidaan tapahtumia kalenteriin '“%s”"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:305
+#: ../src/calendar/gui/e-cal-dialogs.c:303
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Copying memos to the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:311
+#: ../src/calendar/gui/e-cal-dialogs.c:309
 #, fuzzy, c-format
 #| msgid "Copying tasks to the task list '%s'"
 msgid "Copying tasks to the task list “%s”"
 msgstr "Kopioidaan tehtäviä tehtävälistaan '%s'"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:527
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr "_Poistetaanko tämä tietue kaikkien muiden vastaanottajien kansioista?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:533
+#: ../src/calendar/gui/e-cal-dialogs.c:530
 msgid "_Retract comment"
 msgstr "_Poista kommentti"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:692
+#: ../src/calendar/gui/e-cal-dialogs.c:687
 msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/calendar/gui/e-cal-dialogs.c:688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:707
 msgid "January"
 msgstr "Tammikuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "February"
 msgstr "Helmikuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "March"
 msgstr "Maaliskuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "April"
 msgstr "Huhtikuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "May"
 msgstr "Toukokuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "June"
 msgstr "Kesäkuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "July"
 msgstr "Heinäkuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:719
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "August"
 msgstr "Elokuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:720
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "September"
 msgstr "Syyskuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:721
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "October"
 msgstr "Lokakuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:722
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "November"
 msgstr "Marraskuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:723
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "December"
 msgstr "Joulukuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:873
+#: ../src/calendar/gui/e-cal-dialogs.c:870
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:875
+#: ../src/calendar/gui/e-cal-dialogs.c:872
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:879
+#: ../src/calendar/gui/e-cal-dialogs.c:876
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:883
+#: ../src/calendar/gui/e-cal-dialogs.c:880
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:909
+#: ../src/calendar/gui/e-cal-dialogs.c:906
 msgid "This Instance Only"
 msgstr "Vain tätä kertaa"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:913
+#: ../src/calendar/gui/e-cal-dialogs.c:910
 msgid "This and Prior Instances"
 msgstr "Tätä ja edellisiä kertoja"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:916
 msgid "This and Future Instances"
 msgstr "Tätä ja tulevia kertoja"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:924
+#: ../src/calendar/gui/e-cal-dialogs.c:921
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1174 ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1171 ../src/calendar/gui/e-cal-dialogs.c:1253
 #, fuzzy
 msgid "Send my reminders with this event"
 msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1176 ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1173 ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../src/calendar/gui/e-calendar-view.c:464
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../src/calendar/gui/e-calendar-view.c:470
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../src/calendar/gui/e-calendar-view.c:476
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../src/calendar/gui/e-calendar-view.c:482
+#: ../src/calendar/gui/e-calendar-view.c:496
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../src/calendar/gui/e-calendar-view.c:866
+#: ../src/calendar/gui/e-calendar-view.c:906
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Liitetty teksti ei sisällä kelvollista iCalendar-tietoa"
 
-#: ../src/calendar/gui/e-calendar-view.c:877 ../src/calendar/gui/e-cal-ops.c:1556
+#: ../src/calendar/gui/e-calendar-view.c:917 ../src/calendar/gui/e-cal-ops.c:1555
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:882 ../src/calendar/gui/e-cal-ops.c:1559
+#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1558
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../src/calendar/gui/e-calendar-view.c:887 ../src/calendar/gui/e-cal-ops.c:1562
+#: ../src/calendar/gui/e-calendar-view.c:927 ../src/calendar/gui/e-cal-ops.c:1561
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:976
+#: ../src/calendar/gui/e-calendar-view.c:1019
 msgid "No suitable component found"
 msgstr "Soveltuvaa komponenttia ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:1046
+#: ../src/calendar/gui/e-calendar-view.c:1089
 msgid "Pasting iCalendar data"
 msgstr "Liitetään iCalendar-tietoja"
 
@@ -6799,8 +7042,8 @@ msgstr "Liitetään iCalendar-tietoja"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1854 ../src/calendar/gui/e-memo-table.c:499
-#: ../src/calendar/gui/e-task-table.c:819
+#: ../src/calendar/gui/e-calendar-view.c:1889 ../src/calendar/gui/e-memo-table.c:572
+#: ../src/calendar/gui/e-task-table.c:736
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -6808,33 +7051,45 @@ 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.
-#: ../src/calendar/gui/e-calendar-view.c:1858 ../src/calendar/gui/e-memo-table.c:504
-#: ../src/calendar/gui/e-task-table.c:823
+#: ../src/calendar/gui/e-calendar-view.c:1892 ../src/calendar/gui/e-memo-table.c:577
+#: ../src/calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1874
+#: ../src/calendar/gui/e-calendar-view.c:1911
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:839 ../src/calendar/gui/e-to-do-pane.c:363
-#: ../src/calendar/gui/print.c:3545
+#: ../src/calendar/gui/e-task-table.c:758 ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/print.c:3565
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1914 ../src/calendar/gui/e-to-do-pane.c:460
+#: ../src/calendar/gui/e-calendar-view.c:1970 ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2309
-#: ../src/calendar/gui/e-calendar-view.c:2312
-#: ../src/calendar/gui/e-calendar-view.c:2315
-#: ../src/calendar/gui/e-calendar-view.c:2316
+#. Translators: the '%s' stands for a component summary, the '%d' for the years.
+#. The string is used for Birthday & Anniversary events where the first year is
+#. know, constructing a summary which also shows how many years the birthday or
+#. anniversary is for. Example: "Birthday: John Doe (13)"
+#: ../src/calendar/gui/e-calendar-view.c:2117
+#, c-format
+#| msgctxt "language"
+#| msgid "%s (%s)"
+msgctxt "BirthdaySummary"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/calendar/gui/e-calendar-view.c:2318
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2325
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -6843,13 +7098,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.
-#: ../src/calendar/gui/e-calendar-view.c:2311 ../src/calendar/gui/e-day-view.c:3095
-#: ../src/calendar/gui/e-day-view-top-item.c:865
+#: ../src/calendar/gui/e-calendar-view.c:2320 ../src/calendar/gui/e-day-view.c:3079
+#: ../src/calendar/gui/e-day-view-top-item.c:858
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%e. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -6859,15 +7114,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.
-#: ../src/calendar/gui/e-calendar-view.c:2324 ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:861
+#: ../src/calendar/gui/e-calendar-view.c:2333 ../src/calendar/gui/e-day-view.c:3063
+#: ../src/calendar/gui/e-day-view-top-item.c:854
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %e. %bta"
 
-#: ../src/calendar/gui/e-calendar-view.c:2325
-#: ../src/calendar/gui/e-calendar-view.c:2327
-#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2334
+#: ../src/calendar/gui/e-calendar-view.c:2336
+#: ../src/calendar/gui/e-calendar-view.c:2337
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
@@ -6883,7 +7138,7 @@ msgstr "Päättymispäivä"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
 #: ../src/calendar/gui/e-task-table.etspec.h:14
-#: ../src/plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Luotu"
 
@@ -6900,125 +7155,132 @@ msgstr "Viimeksi muokattu"
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/calendar/gui/e-cal-model.c:316
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:10
+#: ../src/calendar/gui/e-cal-model.c:3846
+#: ../src/calendar/gui/e-meeting-list-view.c:693
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Tila"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:11
+#: ../src/calendar/gui/e-meeting-list-view.c:650
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../src/calendar/gui/e-memo-table.etspec.h:3
+#: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1971
+#: ../src/e-util/e-webdav-browser.c:2390 ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "Tyyppi"
+
+#: ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
-#: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3560
-#: ../src/modules/itip-formatter/itip-view.c:6382
+#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1257
+#: ../src/calendar/gui/print.c:1274 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3640
+#: ../src/modules/itip-formatter/itip-view.c:6686
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/calendar/gui/e-cal-model.c:1417 ../src/calendar/gui/e-cal-ops.c:614
-#: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:435
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:609
+#: ../src/calendar/gui/e-cal-ops.c:1246
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:378
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-model.c:1522 ../src/calendar/gui/e-cal-ops.c:186
-#: ../src/calendar/gui/e-cal-ops.c:1367
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:185
+#: ../src/calendar/gui/e-cal-ops.c:1363
 msgid "Creating an event"
 msgstr "Luodaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-model.c:1526 ../src/calendar/gui/e-cal-ops.c:190
-#: ../src/calendar/gui/e-cal-ops.c:1371
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:189
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating a memo"
 msgstr "Luodaan muistilappu"
 
-#: ../src/calendar/gui/e-cal-model.c:1530 ../src/calendar/gui/e-cal-ops.c:194
-#: ../src/calendar/gui/e-cal-ops.c:1375
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:193
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-model.c:1913
+#: ../src/calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/calendar/gui/e-cal-model.c:1915
+#: ../src/calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:177
-#: ../src/calendar/gui/e-meeting-store.c:187
-#: ../src/calendar/gui/e-meeting-store.c:1098
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1096
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1096
 msgid "No"
 msgstr "Ei"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
-#: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:197
-#: ../src/calendar/gui/e-meeting-store.c:220
-#: ../src/modules/itip-formatter/itip-view.c:6370
+#: ../src/calendar/gui/e-cal-model.c:3787
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:179
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/modules/itip-formatter/itip-view.c:6674
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../src/calendar/gui/e-cal-model.c:3823
-#: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:199
-#: ../src/calendar/gui/e-meeting-store.c:222
-#: ../src/modules/itip-formatter/itip-view.c:6376
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-meeting-store.c:181
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/modules/itip-formatter/itip-view.c:6680
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../src/calendar/gui/e-cal-model.c:3824
-#: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:201
-#: ../src/calendar/gui/e-meeting-store.c:224
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-meeting-store.c:183
+#: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/e-cal-model.c:3825
-#: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:203
-#: ../src/calendar/gui/e-meeting-store.c:226
-#: ../src/modules/itip-formatter/itip-view.c:6379
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-meeting-store.c:185
+#: ../src/calendar/gui/e-meeting-store.c:208
+#: ../src/modules/itip-formatter/itip-view.c:6683
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../src/calendar/gui/e-cal-model.c:3826
+#: ../src/calendar/gui/e-cal-model.c:3791
 msgid "Needs action"
 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   ...
-#: ../src/calendar/gui/e-cal-model.c:3881
-#: ../src/calendar/gui/e-meeting-list-view.c:700
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../src/calendar/gui/e-task-table.etspec.h:11
-#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
-#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
-#: ../src/mail/vfoldertypes.xml.in.h:38
-msgid "Status"
-msgstr "Tila"
-
-#: ../src/calendar/gui/e-cal-model-calendar.c:144
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-cal-model-calendar.c:91
+#: ../src/calendar/gui/e-task-table.c:529
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:147
+#: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:608
+#: ../src/calendar/gui/e-task-table.c:530
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:466
+#: ../src/calendar/gui/e-cal-model-tasks.c:456
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7028,11 +7290,9 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:518
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Ei mitään"
+#: ../src/calendar/gui/e-cal-model-tasks.c:553
+msgid "In Progress"
+msgstr "Työn alla"
 
 #: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
@@ -7048,21 +7308,21 @@ msgstr "Nimi puuttuu."
 msgid "Modifying a task"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
+#: ../src/calendar/gui/e-cal-ops.c:411 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
+#: ../src/calendar/gui/e-cal-ops.c:415 ../src/calendar/gui/e-to-do-pane.c:2078
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
+#: ../src/calendar/gui/e-cal-ops.c:419 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
+#: ../src/calendar/gui/e-cal-ops.c:507
 #, fuzzy, c-format
 #| msgid "Meeting information sent"
 msgid "Deleting an event"
@@ -7070,7 +7330,7 @@ msgid_plural "Deleting %d events"
 msgstr[0] "Kokouksen tiedot lähetetty"
 msgstr[1] "Kokouksen tiedot lähetetty"
 
-#: ../src/calendar/gui/e-cal-ops.c:515
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, fuzzy, c-format
 #| msgid "Delete Memo"
 msgid "Deleting a memo"
@@ -7078,14 +7338,14 @@ msgid_plural "Deleting %d memos"
 msgstr[0] "Poista muistilappu"
 msgstr[1] "Poista muistilappu"
 
-#: ../src/calendar/gui/e-cal-ops.c:519
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Poistetaan tehtävä"
 msgstr[1] "Poistetaan %d tehtävää"
 
-#: ../src/calendar/gui/e-cal-ops.c:722
+#: ../src/calendar/gui/e-cal-ops.c:721
 #, fuzzy, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
@@ -7093,7 +7353,7 @@ msgid_plural "Pasting %d events"
 msgstr[0] "Tulosta tämä tapahtuma"
 msgstr[1] "Tulosta tämä tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:737
+#: ../src/calendar/gui/e-cal-ops.c:736
 #, fuzzy, c-format
 #| msgid "Print this memo"
 msgid "Pasting a memo"
@@ -7101,7 +7361,7 @@ msgid_plural "Pasting %d memos"
 msgstr[0] "Tulosta tämä muistilappu"
 msgstr[1] "Tulosta tämä muistilappu"
 
-#: ../src/calendar/gui/e-cal-ops.c:752
+#: ../src/calendar/gui/e-cal-ops.c:751
 #, fuzzy, c-format
 #| msgid "Print this task"
 msgid "Pasting a task"
@@ -7109,98 +7369,97 @@ msgid_plural "Pasting %d tasks"
 msgstr[0] "Tulosta tämä tehtävä"
 msgstr[1] "Tulosta tämä tehtävä"
 
-#: ../src/calendar/gui/e-cal-ops.c:851
+#: ../src/calendar/gui/e-cal-ops.c:847
 msgid "Updating an event"
 msgstr "Päivitetään tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
+#: ../src/calendar/gui/e-cal-ops.c:851
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a memo"
 msgstr "Päivitetään olioita"
 
-#: ../src/calendar/gui/e-cal-ops.c:859
+#: ../src/calendar/gui/e-cal-ops.c:855
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "Päivitetään olioita"
 
-#: ../src/calendar/gui/e-cal-ops.c:967
+#: ../src/calendar/gui/e-cal-ops.c:968
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/calendar/gui/e-cal-ops.c:971
+#: ../src/calendar/gui/e-cal-ops.c:972
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-ops.c:975
+#: ../src/calendar/gui/e-cal-ops.c:976
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:1001
+#: ../src/calendar/gui/e-cal-ops.c:1002
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Purging events in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/calendar/gui/e-cal-ops.c:1005
+#: ../src/calendar/gui/e-cal-ops.c:1006
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Purging memos in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-ops.c:1009
+#: ../src/calendar/gui/e-cal-ops.c:1010
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Purging tasks in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:1109
+#: ../src/calendar/gui/e-cal-ops.c:1105
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "Tyhjennetään"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1109
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "Tulosta muistilaput"
 
-#: ../src/calendar/gui/e-cal-ops.c:1117
+#: ../src/calendar/gui/e-cal-ops.c:1113
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../src/calendar/gui/e-cal-ops.c:1219
+#: ../src/calendar/gui/e-cal-ops.c:1215
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../src/calendar/gui/e-cal-ops.c:2060
+#: ../src/calendar/gui/e-cal-ops.c:2057
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/e-cal-ops.c:2061
-#, fuzzy, c-format
-#| msgid "Copying Items"
+#: ../src/calendar/gui/e-cal-ops.c:2058
+#, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
-msgstr[0] "Kopioidaan tiedostoja"
-msgstr[1] "Kopioidaan tiedostoja"
+msgstr[0] "Kopioidaan tapahtuma"
+msgstr[1] "Kopioidaan %d tapahtumaa"
 
-#: ../src/calendar/gui/e-cal-ops.c:2067
+#: ../src/calendar/gui/e-cal-ops.c:2064
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a memo"
@@ -7208,7 +7467,7 @@ msgid_plural "Moving %d memos"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../src/calendar/gui/e-cal-ops.c:2068
+#: ../src/calendar/gui/e-cal-ops.c:2065
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a memo"
@@ -7216,7 +7475,7 @@ msgid_plural "Copying %d memos"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../src/calendar/gui/e-cal-ops.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:2071
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a task"
@@ -7224,7 +7483,7 @@ msgid_plural "Moving %d tasks"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../src/calendar/gui/e-cal-ops.c:2075
+#: ../src/calendar/gui/e-cal-ops.c:2072
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a task"
@@ -7233,16 +7492,16 @@ msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+#: ../src/calendar/gui/e-cell-date-edit-text.c:177
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+#: ../src/calendar/gui/e-cell-date-edit-text.c:180
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I.%M.%S %p"
 
-#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#: ../src/calendar/gui/e-cell-date-edit-text.c:188
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7255,166 +7514,166 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "Tapahtuman ajankohta on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:206
+#: ../src/calendar/gui/e-comp-editor-event.c:208
 msgid "Event cannot be edited, because the selected calendar could not be opened"
 msgstr "Tapahtumaa ei voi muokata, koska valittua kalenteria ei voida avata"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:208
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 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ä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:460
-#: ../src/calendar/gui/e-comp-editor-task.c:546
+#: ../src/calendar/gui/e-comp-editor-event.c:492
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "Start date is not a valid date"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:462
+#: ../src/calendar/gui/e-comp-editor-event.c:494
 msgid "Start time is not a valid time"
 msgstr "Alkamisaika on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:466
-#: ../src/calendar/gui/e-comp-editor-event.c:482
+#: ../src/calendar/gui/e-comp-editor-event.c:498
+#: ../src/calendar/gui/e-comp-editor-event.c:514
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:337
-#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4202
-#: ../src/e-util/e-misc-utils.c:4214 ../src/e-util/e-misc-utils.c:4228
-#: ../src/mail/e-mail-autoconfig.c:1027 ../src/mail/e-mail-display.c:2292
-#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3969
-#: ../src/mail/em-composer-utils.c:4000 ../src/mail/mail-send-recv.c:598
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4257
+#: ../src/e-util/e-misc-utils.c:4269 ../src/e-util/e-misc-utils.c:4283
+#: ../src/mail/e-mail-autoconfig.c:1029 ../src/mail/e-mail-display.c:2295
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3841
+#: ../src/mail/em-composer-utils.c:3872 ../src/mail/mail-send-recv.c:598
 #: ../src/mail/mail-send-recv.c:1496
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
-#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1221
-#: ../src/shell/e-shell.c:1245 ../src/smime/gui/certificate-manager.c:357
+#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
+#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
 #, c-format
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:476
+#: ../src/calendar/gui/e-comp-editor-event.c:508
 msgid "End date is not a valid date"
 msgstr "Päättymispäivä ei ole kelvollinen päivä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:478
+#: ../src/calendar/gui/e-comp-editor-event.c:510
 msgid "End time is not a valid time"
 msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:677
+#: ../src/calendar/gui/e-comp-editor-event.c:712
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:651
+#: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:679
+#: ../src/calendar/gui/e-comp-editor-event.c:714
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:653
+#: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:685
-#: ../src/calendar/gui/e-comp-editor-task.c:659
+#: ../src/calendar/gui/e-comp-editor-event.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:687
-#: ../src/calendar/gui/e-comp-editor-task.c:661
+#: ../src/calendar/gui/e-comp-editor-event.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:693
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:695
+#: ../src/calendar/gui/e-comp-editor-event.c:730
 msgid "Toggles whether to have All Day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:701
+#: ../src/calendar/gui/e-comp-editor-event.c:736
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:703
+#: ../src/calendar/gui/e-comp-editor-event.c:738
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:747
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:749
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-event.c:754
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-event.c:756
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:846
+#: ../src/calendar/gui/e-comp-editor-event.c:881
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:851
+#: ../src/calendar/gui/e-comp-editor-event.c:886
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:861
+#: ../src/calendar/gui/e-comp-editor-event.c:896
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:919
-#: ../src/calendar/gui/e-comp-editor-memo.c:222
-#: ../src/calendar/gui/e-comp-editor-task.c:829
+#: ../src/calendar/gui/e-comp-editor-event.c:964
+#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:922
-#: ../src/calendar/gui/e-comp-editor-task.c:852
+#: ../src/calendar/gui/e-comp-editor-event.c:967
+#: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:925
-#: ../src/calendar/gui/e-comp-editor-task.c:856
+#: ../src/calendar/gui/e-comp-editor-event.c:970
+#: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:928
-#: ../src/calendar/gui/e-comp-editor-memo.c:225
-#: ../src/calendar/gui/e-comp-editor-task.c:860
+#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:938
+#: ../src/calendar/gui/e-comp-editor-event.c:983
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-event.c:1018
 #, c-format
 msgid "Meeting — %s"
 msgstr "Kokous — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, c-format
 msgid "Appointment — %s"
 msgstr "Tapaaminen — %s"
@@ -7436,23 +7695,23 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:760
+#: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "_Luettelo:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:770
+#: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:256
+#: ../src/calendar/gui/e-comp-editor-memo.c:266
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Memo — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:257
+#: ../src/calendar/gui/e-comp-editor-memo.c:267
 #, fuzzy, c-format
 #| msgid "Memo - %s"
 msgid "Memo — %s"
@@ -7481,7 +7740,7 @@ msgstr "Ei voitu ladata “%s”"
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
 #, fuzzy
 #| msgid ""
 #| "Some attachments are being downloaded. Saving the task would result in the loss "
@@ -7493,57 +7752,57 @@ msgstr ""
 "Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt aiheuttaa "
 "tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
 #: ../src/composer/e-composer-actions.c:312
-msgid "_Attachment..."
-msgstr "_Liite..."
+msgid "_Attachment…"
+msgstr "_Liite…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
 #: ../src/composer/e-composer-actions.c:314 ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
 msgid "_Attachments"
 msgstr "_Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
 msgid "Show attachments"
 msgstr "Näytä liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:387
+#: ../src/calendar/gui/e-comp-editor-page-general.c:392
 #, fuzzy, c-format
 #| msgid "Cannot find matching event in the next %d year"
 #| msgid_plural "Cannot find matching event in the next %d years"
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:394
+#: ../src/calendar/gui/e-comp-editor-page-general.c:399
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:429
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -7551,112 +7810,114 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Yhteystiedon poisto epäonnistui"
 msgstr[1] "Yhteystiedon poisto epäonnistui"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:510
+#: ../src/calendar/gui/e-comp-editor-page-general.c:543
 #, fuzzy
 #| msgid "Email Address is not a valid email"
 msgid "Organizer address is not a valid user mail address"
 msgstr "Sähköpostiosoite ei ole kelvollinen osoite"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:675
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "A_ttendees"
 msgstr "_Osanottajat"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:677
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
 #, fuzzy
 #| msgid "Toggles whether the Attendee Type is displayed"
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:686
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:688
+#: ../src/calendar/gui/e-comp-editor-page-general.c:725
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:694
+#: ../src/calendar/gui/e-comp-editor-page-general.c:731
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:696
+#: ../src/calendar/gui/e-comp-editor-page-general.c:733
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:702
+#: ../src/calendar/gui/e-comp-editor-page-general.c:739
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:704
+#: ../src/calendar/gui/e-comp-editor-page-general.c:741
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:710
+#: ../src/calendar/gui/e-comp-editor-page-general.c:747
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:749
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
 msgid "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
 msgid "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
 msgid "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#, fuzzy
+#| msgid "Atte_ndees"
 msgctxt "ECompEditor"
-msgid "Atte_ndees..."
-msgstr "_Osanottajat..."
+msgid "Atte_ndees…"
+msgstr "_Osanottajat"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor.c:2070 ../src/e-util/e-accounts-window.c:1745
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
+#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-accounts-window.c:1745
 #: ../src/e-util/e-html-editor-actions.c:954
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2681
-#: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:728
-#: ../src/mail/e-mail-browser.c:175 ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2690
+#: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:730
+#: ../src/mail/e-mail-browser.c:195 ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:843
+#: ../src/plugins/email-custom-header/email-custom-header.c:844
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:469 ../src/shell/e-shell-window-actions.c:980
-#: ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/templates/templates.c:469
+#: ../src/shell/e-shell-window-actions.c:1005 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
 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.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
 msgid "on"
 msgstr "Käytössä"
 
@@ -7664,7 +7925,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "ensimmäinen"
@@ -7674,7 +7935,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "toinen"
@@ -7683,7 +7944,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "kolmas"
@@ -7692,7 +7953,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "neljäs"
@@ -7701,7 +7962,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "viides"
@@ -7710,7 +7971,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
 #, fuzzy
 #| msgid "last"
 msgctxt "ECompEditorPageRecur"
@@ -7719,7 +7980,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]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
 #, fuzzy
 #| msgid "Other Date"
 msgctxt "ECompEditorPageRecur"
@@ -7730,7 +7991,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]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
 #, fuzzy
 #| msgid "1st to 10th"
 msgctxt "ECompEditorPageRecur"
@@ -7741,7 +8002,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]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
 #, fuzzy
 #| msgid "11th to 20th"
 msgctxt "ECompEditorPageRecur"
@@ -7752,7 +8013,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]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
 #, fuzzy
 #| msgid "21st to 31st"
 msgctxt "ECompEditorPageRecur"
@@ -7762,7 +8023,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.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
 #, fuzzy
 #| msgid "day"
 #| msgid_plural "days"
@@ -7770,37 +8031,37 @@ msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "päivä"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Sunnuntai"
@@ -7808,14 +8069,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])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
 #, fuzzy
 #| msgid "on the"
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
 #, fuzzy
 #| msgid "occurrences"
 msgctxt "ECompEditorPageRecur"
@@ -7823,20 +8084,20 @@ 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2023
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Tämä tapaaminen _toistuu"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Tämä tehtävä _toistuu"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
 #, fuzzy
 #| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
@@ -7844,104 +8105,104 @@ 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
 #, fuzzy
 #| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Recurrence exception date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
 #, 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"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "R_ecurrence"
 msgstr "Toistu_vuus"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
 #, 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Joka"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "päivä"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "viikko"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "kuukausi"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "vuosi"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "kesto"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "päättyen"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
-#: ../src/mail/e-mail-config-identity-page.c:853 ../src/mail/mail-config.ui.h:67
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/mail/e-mail-config-identity-page.c:854 ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -7951,80 +8212,96 @@ msgstr "Esikatselu"
 msgid "Send To"
 msgstr "Lähetä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-msgid "Reminders"
-msgstr "Muistutukset"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1639
-msgid "_Reminder"
-msgstr "_Muistutus"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1672
-#, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d päivä ennen"
-msgstr[1] "%d päivää ennen"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1679
-#, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d tunti ennen"
-msgstr[1] "%d tuntia ennen"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1686
-#, c-format
-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"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1696
-msgctxt "cal-reminders"
-msgid "15 minutes before"
-msgstr "15 minuuttia ennen"
-
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1698
+#. Translators: This constructs predefined reminder's description, for example "15 minutes before",
+#. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
+#. "2 days 13 hours 1 minute before".
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#, c-format
+#| msgid "is before"
 msgctxt "cal-reminders"
-msgid "1 hour before"
-msgstr "1 tunti ennen"
+msgid "%s before"
+msgstr "%s ennen"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#, fuzzy
+#| msgid "%s attachment"
 msgctxt "cal-reminders"
-msgid "1 day before"
-msgstr "1 päivä ennen"
+msgid "at the start"
+msgstr "Liite: %s"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 #, fuzzy
 #| msgid "Custom"
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Omavalintainen"
 
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+msgid "Set a custom predefined time to"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+msgctxt "cal-reminders"
+msgid "da_ys"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#| msgctxt "cal-reminders"
+#| msgid "hours"
+msgctxt "cal-reminders"
+msgid "_hours"
+msgstr "_tuntia"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#| msgctxt "cal-reminders"
+#| msgid "minutes"
+msgctxt "cal-reminders"
+msgid "_minutes"
+msgstr "_minuuttia"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+msgid "_Add time"
+msgstr "_Lisää aika"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+msgid "Reminders"
+msgstr "Muistutukset"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+msgid "_Reminder"
+msgstr "_Muistutus"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+msgid "Add custom predefined time"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+msgid "Remove custom predefined times"
+msgstr ""
+
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
 #, fuzzy
 #| msgid "minute(s)"
 msgctxt "cal-reminders"
@@ -8032,7 +8309,7 @@ msgid "minute(s)"
 msgstr "minuutti(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
 #, fuzzy
 #| msgid "hour(s)"
 msgctxt "cal-reminders"
@@ -8040,7 +8317,7 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "cal-reminders"
@@ -8048,7 +8325,7 @@ msgid "day(s)"
 msgstr "päivä(ä)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1876
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
 #, fuzzy
 #| msgid "before"
 msgctxt "cal-reminders"
@@ -8056,7 +8333,7 @@ msgid "before"
 msgstr "ennen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
 #, fuzzy
 #| msgid "after"
 msgctxt "cal-reminders"
@@ -8064,7 +8341,7 @@ msgid "after"
 msgstr "jälkeen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
 #, fuzzy
 #| msgid "Start"
 msgctxt "cal-reminders"
@@ -8072,7 +8349,7 @@ msgid "start"
 msgstr "Alkaa"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1896
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
 #, fuzzy
 #| msgid "_Send"
 msgctxt "cal-reminders"
@@ -8080,14 +8357,14 @@ msgid "end"
 msgstr "_Lähetä"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1915
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
 #, 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 ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1940
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
 #, fuzzy
 #| msgid "extra times every"
 msgctxt "cal-reminders"
@@ -8095,183 +8372,161 @@ msgid "extra times every"
 msgstr "ylimääräistä kertaa joka"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1977
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minuuttia"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "tuntia"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1981
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "päivää"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2175
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2062
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Oma _hälytysääni muistutukselles"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2073
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
 msgid "Select a sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2126
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
 msgstr "Lähetä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
 #, fuzzy
 #| msgid "_Schedule Meeting..."
 msgid "_Schedule"
 msgstr "_Järjestä kokous..."
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Yhteenveto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Sijainti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
-#, fuzzy
-#| msgid "Ca_tegories..."
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
 msgctxt "ECompEditor"
-msgid "_Categories..."
-msgstr "Ry_hmät..."
+msgid "_Categories…"
+msgstr "_Luokat…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Verkkosivusto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1154
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1188
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1207
-msgctxt "ECompEditor"
-msgid "Not Started"
-msgstr "Ei aloitettu"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1208
-msgctxt "ECompEditor"
-msgid "In Progress"
-msgstr "Työn alla"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1209
-msgctxt "ECompEditor"
-msgid "Completed"
-msgstr "Valmis"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1210
-msgctxt "ECompEditor"
-msgid "Cancelled"
-msgstr "Peruttu"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1219
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1249
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1251
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1252
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1261
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1315
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1396
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1521
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
@@ -8279,257 +8534,258 @@ msgid "Show time as _busy"
 msgstr "Näytä aika _varattuna"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1648
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1961
 #, fuzzy
 #| msgid "None"
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:241
+#: ../src/calendar/gui/e-comp-editor-task.c:281
 #, fuzzy
 #| msgid "Task's start date is in the past"
 msgid "Task’s start date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:249
+#: ../src/calendar/gui/e-comp-editor-task.c:289
 #, fuzzy
 #| msgid "Task's due date is in the past"
 msgid "Task’s due date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:485
+#: ../src/calendar/gui/e-comp-editor-task.c:530
 #, fuzzy
 #| msgid "Task cannot be edited, because the selected task list is read only"
 msgid "Task cannot be edited, because the selected task list could not be opened"
 msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:487
+#: ../src/calendar/gui/e-comp-editor-task.c:532
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:489
+#: ../src/calendar/gui/e-comp-editor-task.c:534
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Tehtävää ei voi muokata kokonaan, koska et ole tehtävän järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:560
+#: ../src/calendar/gui/e-comp-editor-task.c:605
 msgid "Start date is required for recurring tasks"
 msgstr "Aloituspäivä vaaditaan toistuviin tehtäviin"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:572
+#: ../src/calendar/gui/e-comp-editor-task.c:621
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Due date is not a valid date"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:583
+#: ../src/calendar/gui/e-comp-editor-task.c:632
 #, fuzzy
 #| msgid "Completed date is wrong"
 msgid "Completed date is not a valid date"
 msgstr "Valmistumispäivä on väärin"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:643
 #, fuzzy
 #| msgid "1 minute in the future"
 #| msgid_plural "%d minutes in the future"
 msgid "Completed date cannot be in the future"
 msgstr "yhden minuutin päässä"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:667
+#: ../src/calendar/gui/e-comp-editor-task.c:720
 #, fuzzy
 #| msgid "All _Day Event"
 msgid "All _Day Task"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:669
+#: ../src/calendar/gui/e-comp-editor-task.c:722
 #, fuzzy
 #| msgid "Toggles whether to have All Day Event"
 msgid "Toggles whether to have All Day Task"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:893
+#: ../src/calendar/gui/e-comp-editor-task.c:946
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:894
+#: ../src/calendar/gui/e-comp-editor-task.c:947
 #, fuzzy, c-format
 #| msgid "Task - %s"
 msgid "Task — %s"
 msgstr "Tehtävä - %s"
 
 #: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
 msgid "attachment"
 msgstr "liite"
 
-#: ../src/calendar/gui/e-comp-editor.c:607
+#: ../src/calendar/gui/e-comp-editor.c:610
 #, fuzzy
 #| msgid "Send _updates to attendees"
-msgid "Sending notifications to attendees..."
+msgid "Sending notifications to attendees…"
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../src/calendar/gui/e-comp-editor.c:996
-msgid "Saving changes..."
-msgstr "Tallennetaan muutoksia..."
+#: ../src/calendar/gui/e-comp-editor.c:985 ../src/e-util/e-webdav-browser.c:1818
+msgid "Saving changes…"
+msgstr "Tallennetaan muutoksia…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1256
+#: ../src/calendar/gui/e-comp-editor.c:1245
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984 ../src/composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/composer/e-composer-actions.c:319
 #: ../src/e-util/e-accounts-window.c:1778 ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
-#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:131
-#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
-#: ../src/mail/em-folder-properties.c:1172 ../src/mail/em-subscription-editor.c:1739
+#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:144
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:964
+#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1458
+#: ../src/mail/em-subscription-editor.c:1741
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:314
+#: ../src/shell/e-shell-window-actions.c:842
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../src/calendar/gui/e-comp-editor.c:1986
+#: ../src/calendar/gui/e-comp-editor.c:2029
 msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:773
 #: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:138
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:151
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:863
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
 #: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
-#: ../src/e-util/e-web-view.c:2075 ../src/mail/e-mail-browser.c:140
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-web-view.c:2080 ../src/mail/e-mail-browser.c:153
+#: ../src/shell/e-shell-window-actions.c:865
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:768
 #: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:145 ../src/shell/e-shell-window-actions.c:852
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:870
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2084
-#: ../src/mail/e-mail-browser.c:147 ../src/shell/e-shell-window-actions.c:854
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2089
+#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:872
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/shell/e-shell-window-actions.c:879
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
-#: ../src/calendar/gui/e-comp-editor.c:2014
+#: ../src/calendar/gui/e-comp-editor.c:2057
 msgid "View help"
 msgstr "Näytä ohje"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:778
 #: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:152 ../src/shell/e-shell-window-actions.c:880
+#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:898
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2093
-#: ../src/mail/e-mail-browser.c:154 ../src/shell/e-shell-window-actions.c:882
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2098
+#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:900
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026 ../src/composer/e-composer-actions.c:373
-#: ../src/mail/e-mail-reader.c:2717
+#: ../src/calendar/gui/e-comp-editor.c:2069 ../src/composer/e-composer-actions.c:373
+#: ../src/mail/e-mail-reader.c:2750
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
-msgid "_Print..."
-msgstr "T_ulosta..."
+msgid "_Print…"
+msgstr "_Tulosta…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
+#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2757
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
-msgid "Pre_view..."
-msgstr "E_sikatselu..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:838
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+msgid "Pre_view…"
+msgstr "_Esikatselu…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:788
 #: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
-#: ../src/mail/e-mail-browser.c:159 ../src/shell/e-shell-window-actions.c:950
+#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:968
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:161 ../src/shell/e-shell-window-actions.c:952
+#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:970
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../src/calendar/gui/e-comp-editor.c:2063
+#: ../src/calendar/gui/e-comp-editor.c:2106
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../src/calendar/gui/e-comp-editor.c:2077 ../src/e-util/e-html-editor-actions.c:961
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:168
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:987
+#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-html-editor-actions.c:961
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:188
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1012
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091 ../src/e-util/e-html-editor-actions.c:982
+#: ../src/calendar/gui/e-comp-editor.c:2134 ../src/e-util/e-html-editor-actions.c:982
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098 ../src/composer/e-composer-actions.c:363
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105
-#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:182
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:202
+#: ../src/shell/e-shell-window-actions.c:1055
 #: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2117
+#: ../src/calendar/gui/e-comp-editor.c:2160
 msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
-#: ../src/calendar/gui/e-comp-editor.c:2122
+#: ../src/calendar/gui/e-comp-editor.c:2165
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ../src/calendar/gui/e-comp-editor.c:2124
+#: ../src/calendar/gui/e-comp-editor.c:2167
 msgid "Save current changes and close editor"
 msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
-#: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
-#: ../src/calendar/gui/print.c:2655
+#: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2647
+#: ../src/calendar/gui/print.c:2667
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
-#: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
-#: ../src/calendar/gui/print.c:2657
+#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2652
+#: ../src/calendar/gui/print.c:2669
 msgid "pm"
 msgstr "pm"
 
@@ -8539,14 +8795,14 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:857
-#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2102
+#: ../src/calendar/gui/e-day-view.c:3046
+#: ../src/calendar/gui/e-day-view-top-item.c:850
+#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2109
 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
-#: ../src/calendar/gui/e-day-view.c:3790
+#: ../src/calendar/gui/e-day-view.c:3787
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -8557,29 +8813,29 @@ msgstr "Viikko %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:804
+#: ../src/calendar/gui/e-day-view-time-item.c:811
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:829
+#: ../src/calendar/gui/e-day-view-time-item.c:836
 msgid "Show the second time zone"
 msgstr "Näytä toinen aikavyöhyke"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:846
-#: ../src/modules/calendar/e-calendar-preferences.c:313
-#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/modules/calendar/e-calendar-preferences.c:310
+#: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:333
-#: ../src/modules/calendar/e-calendar-preferences.c:396
-msgid "Select..."
-msgstr "Valitse..."
+#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-timezone-entry.c:346
+#: ../src/modules/calendar/e-calendar-preferences.c:393
+msgid "Select…"
+msgstr "Valitse…"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
@@ -8604,98 +8860,95 @@ msgstr "Osanottajat"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1092 ../src/calendar/gui/print.c:1252
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1253
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:112
-#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1253
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1254
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
 #: ../src/calendar/gui/e-meeting-store.c:114
-#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1254
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1255
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:116
-#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1255
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1256
 msgid "Room"
 msgstr "Huone"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:145
-#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1269
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1270
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1095 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1271
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:149
-#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1271
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1272
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:151
-#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1272
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1273
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:195
-#: ../src/calendar/gui/e-meeting-store.c:218
-#: ../src/calendar/gui/e-meeting-store.c:1105
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:1079
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:631
+#: ../src/calendar/gui/e-meeting-list-view.c:624
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
-#: ../src/calendar/gui/e-meeting-list-view.c:657
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../src/calendar/gui/e-memo-table.etspec.h:3
-#: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
-#: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1934
-#: ../src/e-util/e-webdav-browser.c:2381 ../src/mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "Tyyppi"
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:686
+#: ../src/calendar/gui/e-meeting-list-view.c:679
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
-#: ../src/calendar/gui/e-meeting-store.c:207
-#: ../src/calendar/gui/e-meeting-store.c:230
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:210
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "Valmis"
+
+#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-meeting-store.c:1976
+#: ../src/calendar/gui/e-meeting-store.c:2003
 #, fuzzy, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Syötä salasana käyttäjälle %s palvelimeen %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1986
+#: ../src/calendar/gui/e-meeting-store.c:2013
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1991
-#: ../src/e-util/e-collection-account-wizard.c:470
+#: ../src/calendar/gui/e-meeting-store.c:2018
+#: ../src/e-util/e-collection-account-wizard.c:493
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8710,8 +8963,10 @@ msgid "No Information"
 msgstr "Ei tietoa"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-msgid "Atte_ndees..."
-msgstr "_Osanottajat..."
+#, fuzzy
+#| msgid "Atte_ndees"
+msgid "Atte_ndees…"
+msgstr "_Osanottajat"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
@@ -8774,7 +9029,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3534
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3554
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -8803,38 +9058,38 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/calendar/gui/e-memo-table.c:461 ../src/calendar/gui/e-task-table.c:782
+#: ../src/calendar/gui/e-memo-table.c:535 ../src/calendar/gui/e-task-table.c:700
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:546 ../src/calendar/gui/e-task-table.c:879
+#: ../src/calendar/gui/e-memo-table.c:622 ../src/calendar/gui/e-task-table.c:801
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:566 ../src/calendar/gui/e-task-table.c:898
+#: ../src/calendar/gui/e-memo-table.c:642 ../src/calendar/gui/e-task-table.c:834
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../src/calendar/gui/e-memo-table.c:775
+#: ../src/calendar/gui/e-memo-table.c:850
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../src/calendar/gui/e-memo-table.c:781
+#: ../src/calendar/gui/e-memo-table.c:856
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../src/calendar/gui/e-memo-table.c:787
+#: ../src/calendar/gui/e-memo-table.c:862
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../src/calendar/gui/e-memo-table.c:793
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:574
+#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../src/calendar/gui/e-memo-table.c:799
+#: ../src/calendar/gui/e-memo-table.c:874
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -8842,7 +9097,7 @@ msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
-#: ../src/calendar/gui/e-task-table.c:552 ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/calendar/gui/e-task-table.c:474 ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Määrittämätön"
@@ -8851,29 +9106,29 @@ msgstr "Määrittämätön"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:580
+#: ../src/calendar/gui/e-task-table.c:502
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/calendar/gui/e-task-table.c:1135
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1141
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1147
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../src/calendar/gui/e-task-table.c:1153
-#: ../src/modules/calendar/e-task-shell-view-actions.c:700
+#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../src/calendar/gui/e-task-table.c:1159
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
@@ -8904,137 +9159,154 @@ msgstr "% valmiina"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:10
 #: ../src/calendar/gui/tasktypes.xml.in.h:18
-#: ../src/plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: ../src/calendar/gui/e-timezone-entry.c:344
+#. Translators: 'None' for a time zone, like 'No time zone being set'
+#: ../src/calendar/gui/e-timezone-entry.c:92 ../src/e-util/e-timezone-dialog.c:55
+msgctxt "timezone"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../src/calendar/gui/e-timezone-entry.c:357
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:406
 #, c-format
 msgid "Start: %s"
 msgstr "Alkaa: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:410
+#: ../src/calendar/gui/e-to-do-pane.c:428
 #, c-format
 msgid "Due: %s"
 msgstr "Erääntyy: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:424
+#: ../src/calendar/gui/e-to-do-pane.c:442
 #, fuzzy, c-format
 #| msgid "Completed "
 msgid "Completed: %s"
 msgstr "Valmis "
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
-#: ../src/modules/itip-formatter/itip-view.c:255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../src/modules/itip-formatter/itip-view.c:254
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1462 ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:283
+#: ../src/calendar/gui/e-to-do-pane.c:1578 ../src/e-util/e-datetime-format.c:218
+#: ../src/modules/itip-formatter/itip-view.c:282
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1472
+#: ../src/calendar/gui/e-to-do-pane.c:1588
 #, fuzzy
 #| msgid "With _Due Date"
 msgid "Tasks without Due date"
 msgstr "_Eräpäivän kanssa"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
-msgid "New _Appointment..."
-msgstr "Uusi t_apaaminen..."
+#: ../src/calendar/gui/e-to-do-pane.c:2165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+msgid "New _Appointment…"
+msgstr "Uusi t_apaaminen…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2053
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
-msgid "New _Meeting..."
-msgstr "Uusi _kokous..."
+#: ../src/calendar/gui/e-to-do-pane.c:2173
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+msgid "New _Meeting…"
+msgstr "Uusi _kokous…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2061
-msgid "New _Task..."
-msgstr "Uusi _tehtävä..."
+#: ../src/calendar/gui/e-to-do-pane.c:2181
+msgid "New _Task…"
+msgstr "Uusi _tehtävä…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2069
+#: ../src/calendar/gui/e-to-do-pane.c:2189
 #, fuzzy
 #| msgctxt "New"
 #| msgid "Assigne_d Task"
-msgid "_New Assigned Task..."
+msgid "_New Assigned Task…"
 msgstr "Tehtäväksi_anto"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2082
-msgid "_Open..."
-msgstr "_Avaa..."
+#: ../src/calendar/gui/e-to-do-pane.c:2202
+msgid "_Open…"
+msgstr "_Avaa…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2096
+#: ../src/calendar/gui/e-to-do-pane.c:2216
 #, fuzzy
 #| msgid "Delete This _Occurrence"
-msgid "_Delete This Instance..."
+msgid "_Delete This Instance…"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2104
+#: ../src/calendar/gui/e-to-do-pane.c:2224
 #, fuzzy
 #| msgid "All Instances"
-msgid "D_elete All Instances..."
+msgid "D_elete All Instances…"
 msgstr "Kaikki kerrat"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2112
-msgid "_Delete..."
-msgstr "_Poista..."
+#: ../src/calendar/gui/e-to-do-pane.c:2232
+msgid "_Delete…"
+msgstr "_Poista…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2129
+#: ../src/calendar/gui/e-to-do-pane.c:2249
 msgid "_Show Tasks without Due date"
 msgstr "_Näytä tehtävät ilman eräpäivää"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2395
+#: ../src/calendar/gui/e-to-do-pane.c:2515
 #, fuzzy
 #| msgid "_To Do"
 msgid "To Do"
 msgstr "Te_htävää"
 
+#. Translators: the first '%s' is replaced with a component summary;
+#. the second '%s' is replaced with an event location.
+#. Example: "Meet John Doe (Central Park)"
+#: ../src/calendar/gui/e-week-view.c:3705
+#, c-format
+#| msgctxt "language"
+#| msgid "%s (%s)"
+msgctxt "SummaryWithLocation"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2081
+#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2088
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:786 ../src/calendar/gui/itip-utils.c:848
-#: ../src/calendar/gui/itip-utils.c:982
+#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
+#: ../src/calendar/gui/itip-utils.c:1010
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../src/calendar/gui/itip-utils.c:839
+#: ../src/calendar/gui/itip-utils.c:851
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../src/calendar/gui/itip-utils.c:1070 ../src/calendar/gui/itip-utils.c:1231
+#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1082
+#: ../src/calendar/gui/itip-utils.c:1120
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -9042,7 +9314,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -9051,7 +9323,7 @@ msgstr "Hyväksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1126
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -9063,7 +9335,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".
-#: ../src/calendar/gui/itip-utils.c:1133 ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -9072,7 +9344,7 @@ msgstr "Hylätty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1140
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -9080,7 +9352,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".
-#: ../src/calendar/gui/itip-utils.c:1153
+#: ../src/calendar/gui/itip-utils.c:1194
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -9088,7 +9360,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".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1201
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -9096,7 +9368,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".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1208
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -9104,166 +9376,203 @@ 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".
-#: ../src/calendar/gui/itip-utils.c:1174
+#: ../src/calendar/gui/itip-utils.c:1215
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../src/calendar/gui/itip-utils.c:1252
+#: ../src/calendar/gui/itip-utils.c:1295
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1260
+#: ../src/calendar/gui/itip-utils.c:1303
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1289
+#: ../src/calendar/gui/itip-utils.c:1332
 #, 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."
 
-#: ../src/calendar/gui/itip-utils.c:1294
+#: ../src/calendar/gui/itip-utils.c:1337
 msgid "Unable to book a resource, error: "
 msgstr "Resurssin varaaminen ei onnistu, virhe:"
 
-#: ../src/calendar/gui/itip-utils.c:1465
+#: ../src/calendar/gui/itip-utils.c:1530
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../src/calendar/gui/itip-utils.c:2210
-#, fuzzy
-#| msgid "Sending message"
+#: ../src/calendar/gui/itip-utils.c:2311
 msgid "Sending an event"
-msgstr "Lähetetään viestiä"
+msgstr "Lähetetään tapahtuma"
 
-#: ../src/calendar/gui/itip-utils.c:2214
+#: ../src/calendar/gui/itip-utils.c:2315
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../src/calendar/gui/itip-utils.c:2218
+#: ../src/calendar/gui/itip-utils.c:2319
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
 msgstr "Lähetys"
 
+#. Translator: This is used as a placeholder when an event doesn't have set a location
+#: ../src/calendar/gui/itip-utils.c:2571
+msgctxt "Location"
+msgid "Unspecified"
+msgstr "Määrittämätön"
+
+#: ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d päivä"
+msgstr[1] "%d päivää"
+
+#: ../src/calendar/gui/misc.c:101
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
+
+#: ../src/calendar/gui/misc.c:107
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/gui/misc.c:111
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
+
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Ma"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ti"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:732
 msgid "We"
 msgstr "Ke"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:733
 msgid "Th"
 msgstr "To"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:737
+#: ../src/calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:738
+#: ../src/calendar/gui/print.c:735
 msgid "Sa"
 msgstr "La"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:739
+#: ../src/calendar/gui/print.c:736
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3327
+#: ../src/calendar/gui/print.c:3346
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3337
+#: ../src/calendar/gui/print.c:3356
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3343
+#: ../src/calendar/gui/print.c:3362
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3353
+#: ../src/calendar/gui/print.c:3372
 msgid " (Due "
 msgstr " (erääntyy "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../src/calendar/gui/print.c:3360
+#: ../src/calendar/gui/print.c:3379
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../src/calendar/gui/print.c:3504
+#: ../src/calendar/gui/print.c:3524
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../src/calendar/gui/print.c:3506 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3526 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/gui/print.c:3508
+#: ../src/calendar/gui/print.c:3528
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/gui/print.c:3564
+#: ../src/calendar/gui/print.c:3585
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../src/calendar/gui/print.c:3608
+#: ../src/calendar/gui/print.c:3614
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../src/calendar/gui/print.c:3624
+#: ../src/calendar/gui/print.c:3630
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3645
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3660
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3670
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../src/calendar/gui/print.c:3681
+#: ../src/calendar/gui/print.c:3688
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "Ei aloitettu"
+
 #: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "Kesken"
@@ -9287,208 +9596,208 @@ msgstr "on vähemmän kuin"
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/calendar/importers/icalendar-importer.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:108
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:322
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:88
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:267
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/calendar/importers/icalendar-importer.c:330
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:330
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:275
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: ../src/calendar/importers/icalendar-importer.c:351
+#: ../src/calendar/importers/icalendar-importer.c:372
 msgid "Cre_ate new calendar"
 msgstr "_Luo uusi kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:355
+#: ../src/calendar/importers/icalendar-importer.c:376
 msgid "Cre_ate new task list"
 msgstr "Luo _uusi tehtävälista"
 
-#: ../src/calendar/importers/icalendar-importer.c:500
-#: ../src/calendar/importers/icalendar-importer.c:939
+#: ../src/calendar/importers/icalendar-importer.c:521
+#: ../src/calendar/importers/icalendar-importer.c:971
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../src/calendar/importers/icalendar-importer.c:647
+#: ../src/calendar/importers/icalendar-importer.c:668
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:648
+#: ../src/calendar/importers/icalendar-importer.c:669
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:740
+#: ../src/calendar/importers/icalendar-importer.c:764
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../src/calendar/importers/icalendar-importer.c:825
+#: ../src/calendar/importers/icalendar-importer.c:859
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:826
+#: ../src/calendar/importers/icalendar-importer.c:860
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1102
+#: ../src/calendar/importers/icalendar-importer.c:1134
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1145
+#: ../src/calendar/importers/icalendar-importer.c:1177
 msgid "GNOME Calendar"
 msgstr "Gnomen kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:1146
+#: ../src/calendar/importers/icalendar-importer.c:1178
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/calendar/importers/icalendar-importer.c:1220
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1257
+#: ../src/calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/importers/icalendar-importer.c:1223
-#: ../src/calendar/importers/icalendar-importer.c:1533
+#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1584
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1232
+#: ../src/calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1279
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1296
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1263
+#: ../src/calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1266
+#: ../src/calendar/importers/icalendar-importer.c:1302
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1270
+#: ../src/calendar/importers/icalendar-importer.c:1306
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1275
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1311
+#: ../src/calendar/importers/icalendar-importer.c:1627
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1281
+#: ../src/calendar/importers/icalendar-importer.c:1318
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1289
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1326
+#: ../src/calendar/importers/icalendar-importer.c:1622
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1300
+#: ../src/calendar/importers/icalendar-importer.c:1336
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1312
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1322
+#: ../src/calendar/importers/icalendar-importer.c:1356
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1346
+#: ../src/calendar/importers/icalendar-importer.c:1381
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1354
+#: ../src/calendar/importers/icalendar-importer.c:1388
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1365
-#: ../src/calendar/importers/icalendar-importer.c:1368
+#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1408
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1388
-#: ../src/calendar/importers/icalendar-importer.c:1391
+#: ../src/calendar/importers/icalendar-importer.c:1437
+#: ../src/calendar/importers/icalendar-importer.c:1440
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1456
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1565
+#: ../src/calendar/importers/icalendar-importer.c:1617
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -11041,8 +11350,8 @@ msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
 #: ../src/composer/e-composer-actions.c:226
-msgid "Save as..."
-msgstr "Tallenna nimellä..."
+msgid "Save as…"
+msgstr "Tallenna nimellä…"
 
 #: ../src/composer/e-composer-actions.c:321
 msgid "Close the current file"
@@ -11056,12 +11365,12 @@ msgstr "Uusi _viesti"
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1453
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1469
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:896
+#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
@@ -11070,8 +11379,8 @@ msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
 #: ../src/composer/e-composer-actions.c:347
-msgid "Save _As..."
-msgstr "Tallenna _nimellä..."
+msgid "Save _As…"
+msgstr "Tallenna _nimellä…"
 
 #: ../src/composer/e-composer-actions.c:349
 msgid "Save the current file with a different name"
@@ -11206,11 +11515,11 @@ msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1966
+#: ../src/e-util/e-collection-account-wizard.c:2003
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/e-webdav-browser.c:2417
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-identity-page.c:551
 #: ../src/mail/e-mail-config-summary-page.c:332
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
@@ -11261,7 +11570,7 @@ msgid "S_ubject:"
 msgstr "_Aihe:"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:743
+#: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
@@ -11287,11 +11596,11 @@ msgid ""
 msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
+#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../src/composer/e-msg-composer.c:4987
+#: ../src/composer/e-msg-composer.c:5006
 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)"
@@ -11444,7 +11753,7 @@ msgid "_Save to Outbox"
 msgstr "_Tallenna lähteviin"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:643
+#: ../src/e-util/e-collection-account-wizard.c:675
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
@@ -11584,20 +11893,20 @@ msgstr "Äänisoitin"
 msgid "Play the attachment in embedded audio player"
 msgstr "Toista liite upotetussa äänisoittimessa"
 
-#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-formatter-headers.c:108
 #: ../src/em-format/e-mail-part-headers.c:46 ../src/mail/e-mail-tag-editor.c:196
 #: ../src/mail/message-list.etspec.h:5 ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../src/em-format/e-mail-formatter-headers.c:132
+#: ../src/em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(Ei aihetta)"
 
 #. Translators: This message suggests to the receipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:339
+#: ../src/em-format/e-mail-formatter-headers.c:344
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
@@ -11612,17 +11921,17 @@ msgstr "Tavallinen kuva"
 msgid "Display part as an image"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:253
 msgid "RFC822 message"
 msgstr "RFC822-viesti"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:254
 #, fuzzy
 #| msgid "Formatting message"
 msgid "Format part as an RFC822 message"
 msgstr "Muotoillaan viestiä"
 
-#: ../src/em-format/e-mail-formatter-print.c:51 ../src/e-util/e-webdav-browser.c:2352
+#: ../src/em-format/e-mail-formatter-print.c:51 ../src/e-util/e-webdav-browser.c:2361
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
@@ -11634,7 +11943,7 @@ msgstr "Nimi"
 msgid "Size"
 msgstr "Koko"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:181
 #: ../src/em-format/e-mail-part-headers.c:51 ../src/mail/e-mail-tag-editor.c:201
 #: ../src/mail/filtertypes.xml.in.h:16 ../src/mail/message-list.etspec.h:6
 #: ../src/mail/searchtypes.xml.in.h:17 ../src/mail/vfoldertypes.xml.in.h:17
@@ -11644,8 +11953,8 @@ msgid "Subject"
 msgstr "Aihe"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:346
+#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
 #: ../src/modules/mail/em-mailer-prefs.c:1619
 #: ../src/modules/mail/em-mailer-prefs.c:1668
@@ -11663,12 +11972,12 @@ msgid "Display part as enriched text"
 msgstr ""
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:387
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
@@ -11810,59 +12119,59 @@ msgstr ""
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../src/em-format/e-mail-formatter-utils.c:205
-#: ../src/em-format/e-mail-formatter-utils.c:222
+#: ../src/em-format/e-mail-formatter-utils.c:212
+#: ../src/em-format/e-mail-formatter-utils.c:237
 #: ../src/em-format/e-mail-part-headers.c:48 ../src/mail/message-list.etspec.h:9
 #: ../src/mail/searchtypes.xml.in.h:11 ../src/mail/vfoldertypes.xml.in.h:11
 #: ../src/modules/mail/em-mailer-prefs.c:62
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: ../src/em-format/e-mail-formatter-utils.c:206
-#: ../src/em-format/e-mail-formatter-utils.c:223
+#: ../src/em-format/e-mail-formatter-utils.c:213
+#: ../src/em-format/e-mail-formatter-utils.c:238
 #: ../src/em-format/e-mail-part-headers.c:49 ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../src/em-format/e-mail-formatter-utils.c:207
-#: ../src/em-format/e-mail-formatter-utils.c:224
+#: ../src/em-format/e-mail-formatter-utils.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:239
 #: ../src/em-format/e-mail-part-headers.c:50 ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: ../src/em-format/e-mail-formatter-utils.c:562
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "GPG signed"
 msgstr "GPG-allekirjoitettu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:562
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "partially GPG signed"
 msgstr "osittain GPG-allekirjoitettu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:563
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "GPG encrypted"
 msgstr "GPG-salattu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:563
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "partially GPG encrypted"
 msgstr "osittain GPG-salattu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "S/MIME signed"
 msgstr "S/MIME-allekirjoitettu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "partially S/MIME signed"
 msgstr "osittain S/MIME-allekirjoitettu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "S/MIME encrypted"
 msgstr "S/MIME-salattu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "partially S/MIME encrypted"
 msgstr "osittain S/MIME-salattu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:678
+#: ../src/em-format/e-mail-formatter-utils.c:693
 #: ../src/mail/e-mail-config-security-page.c:856
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
@@ -11874,7 +12183,7 @@ msgstr "Turvallisuus"
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../src/em-format/e-mail-parser-application-smime.c:101
+#: ../src/em-format/e-mail-parser-application-smime.c:113
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "S/MIME-viestin jäsennys epäonnistui: %s"
@@ -11885,7 +12194,7 @@ msgid "Could not parse PGP message: %s"
 msgstr "PGP-viestin jäsennys epäonnistui: %s"
 
 #: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
-#: ../src/em-format/e-mail-parser-multipart-signed.c:152
+#: ../src/em-format/e-mail-parser-multipart-signed.c:163
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Virhe vahvistaessa allekirjoitusta: %s"
@@ -11923,21 +12232,21 @@ msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:65
-#: ../src/em-format/e-mail-parser-multipart-signed.c:100
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:74
+#: ../src/em-format/e-mail-parser-multipart-signed.c:109
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi."
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:80
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:89
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:108
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP/MIME-viestin jäsennys epäonnistui: %s"
 
-#: ../src/em-format/e-mail-parser-multipart-signed.c:138
+#: ../src/em-format/e-mail-parser-multipart-signed.c:149
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
@@ -11978,7 +12287,7 @@ msgstr "_Tuo varmenne"
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../src/em-format/e-mail-part-utils.c:556
+#: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
@@ -11998,7 +12307,7 @@ msgstr "evolutionin kalenterin kohta"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:910
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
@@ -12015,13 +12324,12 @@ msgstr "Kalenterit"
 
 #: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
 #: ../src/e-util/e-accounts-window.c:910
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Memo Lists"
 msgstr "Muistilappulistat"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Task Lists"
 msgstr "Tehtävälistat"
 
@@ -12074,10 +12382,10 @@ msgstr "Evolution-tilit"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
+#: ../src/mail/em-subscription-editor.c:1952
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 msgid "_Refresh"
 msgstr "_Päivitä"
 
@@ -12119,13 +12427,14 @@ msgstr "%s"
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
 #: ../src/e-util/e-activity.c:273
-#: ../src/modules/calendar/e-cal-base-shell-content.c:142
+#: ../src/modules/addressbook/e-book-shell-view-private.c:334
+#: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Cancel"
 msgstr "Peru"
 
@@ -12198,14 +12507,14 @@ msgstr "Liitettä ei voitu tallentaa"
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:277
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:241
-#: ../src/e-util/e-webdav-browser.c:2447
+#: ../src/e-util/e-html-editor-link-dialog.c:229
+#: ../src/e-util/e-webdav-browser.c:2456
 msgid "_Description:"
 msgstr "K_uvaus:"
 
@@ -12275,8 +12584,8 @@ msgid "Save extracted files and the original _archive"
 msgstr "Tallenna puretut tiedostot ja a_lkuperäinen pakattu arkistotiedosto"
 
 #: ../src/e-util/e-attachment-view.c:308
-msgid "Open With Other Application..."
-msgstr "Avaa tois_ella sovelluksella..."
+msgid "Open With Other Application…"
+msgstr "Avaa toisella sovelluksella…"
 
 #: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
@@ -12294,16 +12603,16 @@ msgid "Save _As"
 msgstr "Tallenna _nimellä"
 
 #: ../src/e-util/e-attachment-view.c:341
-msgid "A_dd Attachment..."
-msgstr "_Lisää liite..."
+msgid "A_dd Attachment…"
+msgstr "_Lisää liite…"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
+#: ../src/modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
@@ -12414,25 +12723,25 @@ msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käytt
 msgid "Copy memo list contents locally for offline operation"
 msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../src/e-util/e-categories-editor.c:246
+#: ../src/e-util/e-categories-editor.c:251
 msgid "Currently _used categories:"
 msgstr "Käytössä _olevat luokat:"
 
-#: ../src/e-util/e-categories-editor.c:257
+#: ../src/e-util/e-categories-editor.c:262
 msgid "_Available Categories:"
 msgstr "_Käytettävissä olevat luokat:"
 
-#: ../src/e-util/e-categories-editor.c:297
+#: ../src/e-util/e-categories-editor.c:302
 msgctxt "category"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/e-util/e-categories-editor.c:301
+#: ../src/e-util/e-categories-editor.c:306
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/e-util/e-categories-editor.c:305
+#: ../src/e-util/e-categories-editor.c:310
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Poista"
@@ -12446,33 +12755,33 @@ msgstr "Kuvake"
 msgid "Create category “%s”"
 msgstr "Luo luokka “%s”"
 
-#: ../src/e-util/e-category-editor.c:169 ../src/e-util/e-category-editor.c:234
+#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
 msgid "Category Icon"
 msgstr "Luokan kuvake"
 
-#: ../src/e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:171
 msgid "_No Image"
 msgstr "_Ei kuvaa"
 
-#: ../src/e-util/e-category-editor.c:207
+#: ../src/e-util/e-category-editor.c:205
 msgid "Category _Name"
 msgstr "Luokan _nimi"
 
-#: ../src/e-util/e-category-editor.c:220
+#: ../src/e-util/e-category-editor.c:218
 msgid "Category _Icon"
 msgstr "Luokan _kuvake"
 
-#: ../src/e-util/e-category-editor.c:236
+#: ../src/e-util/e-category-editor.c:234
 #, fuzzy
 #| msgid "Insert Emoticon"
 msgid "_Unset icon"
 msgstr "Lisää hymiö"
 
-#: ../src/e-util/e-category-editor.c:262
+#: ../src/e-util/e-category-editor.c:260
 msgid "Category Properties"
 msgstr "Luokan ominaisuudet"
 
-#: ../src/e-util/e-category-editor.c:323
+#: ../src/e-util/e-category-editor.c:321
 #, fuzzy, c-format
 #| msgid ""
 #| "There is already a category '%s' in the configuration. Please use another name"
@@ -12485,7 +12794,7 @@ msgid "popup list"
 msgstr "ponnahduslista"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2143
 msgid "?"
 msgstr "?"
 
@@ -12599,158 +12908,164 @@ msgstr "Merkistön koodaus"
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: ../src/e-util/e-charset-combo-box.c:363
-msgid "Other..."
-msgstr "Muut..."
+#: ../src/e-util/e-charset-combo-box.c:364
+msgid "Other…"
+msgstr "Muu…"
 
 #: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
 #, c-format
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
 msgstr "_Valmis"
 
-#: ../src/e-util/e-collection-account-wizard.c:108
-#: ../src/e-util/e-collection-account-wizard.c:266 ../src/e-util/e-search-bar.c:667
+#: ../src/e-util/e-collection-account-wizard.c:110
+#, fuzzy
+#| msgid "_Skip Lookup"
+msgid "_Look Up"
+msgstr "_Ohita haku"
+
+#: ../src/e-util/e-collection-account-wizard.c:112
+#: ../src/e-util/e-collection-account-wizard.c:273 ../src/e-util/e-search-bar.c:677
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../src/e-util/e-collection-account-wizard.c:180
+#: ../src/e-util/e-collection-account-wizard.c:184
 msgid "New Collection Account"
 msgstr "Uusi kokoelmatili"
 
-#: ../src/e-util/e-collection-account-wizard.c:251 ../src/e-util/e-search-bar.c:655
+#: ../src/e-util/e-collection-account-wizard.c:258 ../src/e-util/e-search-bar.c:665
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../src/e-util/e-collection-account-wizard.c:416
+#: ../src/e-util/e-collection-account-wizard.c:439
 msgid "Looking up details, please wait…"
 msgstr "Etsitään tietoja, odota hetki…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:473
+#: ../src/e-util/e-collection-account-wizard.c:496
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Salasana vaaditaan jatkamiseksi. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:486
+#: ../src/e-util/e-collection-account-wizard.c:509
 msgid "View certificate"
 msgstr "Näytä varmenne"
 
 #. Translators: The first %s is replaced with actual error message about site certificate invalidity,
 #. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:490
+#: ../src/e-util/e-collection-account-wizard.c:513
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:528
+#: ../src/e-util/e-collection-account-wizard.c:551
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter the "
 "account manually instead or change above settings."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:530
+#: ../src/e-util/e-collection-account-wizard.c:553
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/e-util/e-collection-account-wizard.c:625
+#: ../src/e-util/e-collection-account-wizard.c:657
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/e-util/e-collection-account-wizard.c:637
+#: ../src/e-util/e-collection-account-wizard.c:669
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../src/e-util/e-collection-account-wizard.c:780
-#: ../src/e-util/e-webdav-browser.c:473
+#: ../src/e-util/e-collection-account-wizard.c:812
+#: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../src/e-util/e-collection-account-wizard.c:781
+#: ../src/e-util/e-collection-account-wizard.c:813
 #, fuzzy
 #| msgid "Mail Receipt"
 msgid "Mail Receive"
 msgstr "Sähköpostin vastaanotto"
 
-#: ../src/e-util/e-collection-account-wizard.c:782
+#: ../src/e-util/e-collection-account-wizard.c:814
 #, fuzzy
 #| msgid "Mailer"
 msgid "Mail Send"
 msgstr "Postittaja"
 
-#: ../src/e-util/e-collection-account-wizard.c:783
+#: ../src/e-util/e-collection-account-wizard.c:815
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../src/e-util/e-collection-account-wizard.c:785
+#: ../src/e-util/e-collection-account-wizard.c:817
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "Memo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-collection-account-wizard.c:786
+#: ../src/e-util/e-collection-account-wizard.c:818
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-collection-account-wizard.c:1122
+#: ../src/e-util/e-collection-account-wizard.c:1154
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1429
+#: ../src/e-util/e-collection-account-wizard.c:1461
 msgid "Saving account settings, please wait…"
 msgstr "Tallennetaan tilin asetuksia, odota hetki…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1573
+#: ../src/e-util/e-collection-account-wizard.c:1612
 msgid "User details"
 msgstr "Käyttäjän tiedot"
 
-#: ../src/e-util/e-collection-account-wizard.c:1586
+#: ../src/e-util/e-collection-account-wizard.c:1625
 msgid "_Email Address or User name:"
 msgstr "S_ähköpostiosoite tai käyttäjätunnus:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1617
+#: ../src/e-util/e-collection-account-wizard.c:1656
 msgid "_Advanced Options"
 msgstr "_Lähetysasetukset"
 
-#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../src/e-util/e-collection-account-wizard.c:1661
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1641
+#: ../src/e-util/e-collection-account-wizard.c:1680
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in addition "
 "to the domain of the e-mail address."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1833
+#: ../src/e-util/e-collection-account-wizard.c:1870
 #, fuzzy
 #| msgid "Level beyond which the message should be logged."
 msgid "Select which parts should be configured:"
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../src/e-util/e-collection-account-wizard.c:1957
-#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/e-util/e-collection-account-wizard.c:1994
+#: ../src/mail/e-mail-config-identity-page.c:542
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Tilitiedot"
@@ -12759,184 +13074,182 @@ msgstr "Tilitiedot"
 msgid "Choose custom color"
 msgstr "Käytä omavalintainen väri"
 
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:76
 msgid "black"
 msgstr "musta"
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:77
 msgid "light brown"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:78
 msgid "brown gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:79
 msgid "dark green #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:80
 msgid "navy"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:81
 msgid "dark blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:82
 msgid "purple #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:83
 msgid "very dark gray"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:85
 #, fuzzy
 #| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:86
 msgid "red-orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:87
 msgid "gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:88
 msgid "dark green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:89
 msgid "dull blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:90
 msgid "blue"
 msgstr "sininen"
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:91
 msgid "dull purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:92
 msgid "dark grey"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:94
 msgid "red"
 msgstr "punainen"
 
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:95
 msgid "orange"
 msgstr "oranssi"
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:96
 msgid "lime"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:97
 msgid "dull green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:98
 msgid "dull blue #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:99
 msgid "sky blue #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:100
 msgid "purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:101
 msgid "gray"
 msgstr "harmaa"
 
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:103
 #, fuzzy
 #| msgid "Image"
 msgid "magenta"
 msgstr "Kuva"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:104
 msgid "bright orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:105
 msgid "yellow"
 msgstr "keltainen"
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:106
 msgid "green"
 msgstr "vihreä"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:107
 msgid "cyan"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:108
 msgid "bright blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:109
 #, fuzzy
 #| msgid "_Required people"
 msgid "red purple"
 msgstr "_Vaaditut henkilöt"
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:110
 msgid "light grey"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:112
 msgid "pink"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:113
 msgid "light orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:114
 msgid "light yellow"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:115
 msgid "light green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:116
 msgid "light cyan"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:117
 msgid "light blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:118
 msgid "light purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:119
 msgid "white"
 msgstr "valkoinen"
 
-#: ../src/e-util/e-color-combo.c:641 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/e-util/e-color-combo.c:539 ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4759
+#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4849
 #: ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Oletukset"
 
 #: ../src/e-util/e-config-lookup.c:821
-#, fuzzy
-#| msgid "Loading…"
 msgid "Running…"
-msgstr "Ladataan…"
+msgstr "Suoritetaan…"
 
 #: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
@@ -13088,10 +13401,9 @@ msgstr ""
 
 #. Translators: The %s is replaced with a spin button; always keep it in the string at the right position
 #: ../src/e-util/e-dialog-widgets.c:437
-#, fuzzy, c-format
-#| msgid "_Mark messages as read after"
+#, c-format
 msgid "Mark messages as read after %s seconds"
-msgstr "Merkitse vie_stit luetuiksi viiveellä"
+msgstr "Merkitse viestit luetuksi %s sekunnin jälkeen"
 
 #. Translators: :-)
 #: ../src/e-util/e-emoticon-chooser.c:38
@@ -13372,7 +13684,7 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #: ../src/e-util/e-filter-rule.c:1080 ../src/e-util/e-html-editor-page-dialog.c:59
 #: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:764
+#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:141
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
@@ -13494,20 +13806,20 @@ msgid "Increase Indent"
 msgstr "Lisää sisennystä"
 
 #: ../src/e-util/e-html-editor-actions.c:1020
-msgid "_HTML File..."
-msgstr "_HTML-tiedosto..."
+msgid "_HTML File…"
+msgstr "_HTML-tiedosto…"
 
 #: ../src/e-util/e-html-editor-actions.c:1027
-msgid "Te_xt File..."
-msgstr "Te_kstitiedosto..."
+msgid "Te_xt File…"
+msgstr "Te_kstitiedosto…"
 
 #: ../src/e-util/e-html-editor-actions.c:1034
 msgid "Paste _Quotation"
 msgstr "_Liitä lainaus"
 
 #: ../src/e-util/e-html-editor-actions.c:1041
-msgid "_Find..."
-msgstr "_Etsi..."
+msgid "_Find…"
+msgstr "_Etsi…"
 
 #: ../src/e-util/e-html-editor-actions.c:1043
 msgid "Search for text"
@@ -13518,16 +13830,16 @@ msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
 #: ../src/e-util/e-html-editor-actions.c:1055
-msgid "Re_place..."
-msgstr "_Korvaa..."
+msgid "Re_place…"
+msgstr "_Korvaa…"
 
 #: ../src/e-util/e-html-editor-actions.c:1057
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
 #: ../src/e-util/e-html-editor-actions.c:1062
-msgid "Check _Spelling..."
-msgstr "_Oikolue..."
+msgid "Check _Spelling…"
+msgstr "_Oikolue…"
 
 #: ../src/e-util/e-html-editor-actions.c:1069
 msgid "_Decrease Indent"
@@ -13642,8 +13954,8 @@ msgstr "_Aakkosellinen luettelo"
 
 #: ../src/e-util/e-html-editor-actions.c:1227
 #: ../src/e-util/e-html-editor-actions.c:1265
-msgid "_Image..."
-msgstr "_Kuva..."
+msgid "_Image…"
+msgstr "_Kuva…"
 
 #. Translators: This is an action tooltip
 #: ../src/e-util/e-html-editor-actions.c:1230
@@ -13652,8 +13964,8 @@ msgstr "Sisällytä kuva"
 
 #: ../src/e-util/e-html-editor-actions.c:1235
 #: ../src/e-util/e-html-editor-actions.c:1272
-msgid "_Link..."
-msgstr "_Linkki..."
+msgid "_Link…"
+msgstr "_Linkki…"
 
 #: ../src/e-util/e-html-editor-actions.c:1237
 msgid "Insert Link"
@@ -13662,8 +13974,8 @@ msgstr "Lisää linkki"
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:1243
 #: ../src/e-util/e-html-editor-actions.c:1287
-msgid "_Rule..."
-msgstr "_Viiva..."
+msgid "_Rule…"
+msgstr "_Viiva…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:1246
@@ -13672,20 +13984,20 @@ msgstr "Lisää viiva"
 
 #: ../src/e-util/e-html-editor-actions.c:1251
 #: ../src/e-util/e-html-editor-actions.c:1294
-msgid "_Table..."
-msgstr "_Taulukko..."
+msgid "_Table…"
+msgstr "_Taulukko…"
 
 #: ../src/e-util/e-html-editor-actions.c:1253
 msgid "Insert Table"
 msgstr "Lisää taulukko"
 
 #: ../src/e-util/e-html-editor-actions.c:1258
-msgid "_Cell..."
-msgstr "_Solu..."
+msgid "_Cell…"
+msgstr "_Solu…"
 
 #: ../src/e-util/e-html-editor-actions.c:1279
-msgid "Pa_ge..."
-msgstr "Si_vu..."
+msgid "Pa_ge…"
+msgstr "Si_vu…"
 
 #: ../src/e-util/e-html-editor-actions.c:1303
 msgid "Font _Size"
@@ -13825,37 +14137,37 @@ msgid "Row Below"
 msgstr "Rivi alas"
 
 #: ../src/e-util/e-html-editor-actions.c:1538
-msgid "Cell..."
-msgstr "Solu..."
+msgid "Cell…"
+msgstr "Solu…"
 
 #: ../src/e-util/e-html-editor-actions.c:1545
-msgid "Image..."
-msgstr "Kuva..."
+msgid "Image…"
+msgstr "Kuva…"
 
 #: ../src/e-util/e-html-editor-actions.c:1552
-msgid "Link..."
-msgstr "Linkki..."
+msgid "Link…"
+msgstr "Linkki…"
 
 #: ../src/e-util/e-html-editor-actions.c:1559
-msgid "Page..."
-msgstr "Sivu..."
+msgid "Page…"
+msgstr "Sivu…"
 
 #: ../src/e-util/e-html-editor-actions.c:1566
-msgid "Paragraph..."
-msgstr "Kappale..."
+msgid "Paragraph…"
+msgstr "Kappale…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:1574
-msgid "Rule..."
-msgstr "Viiva..."
+msgid "Rule…"
+msgstr "Viiva…"
 
 #: ../src/e-util/e-html-editor-actions.c:1581
-msgid "Table..."
-msgstr "Taulukko..."
+msgid "Table…"
+msgstr "Taulukko…"
 
 #: ../src/e-util/e-html-editor-actions.c:1588
-msgid "Text..."
-msgstr "Text..."
+msgid "Text…"
+msgstr "Teksti…"
 
 #: ../src/e-util/e-html-editor-actions.c:1595
 msgid "Remove Link"
@@ -13866,10 +14178,8 @@ msgid "Add Word to Dictionary"
 msgstr "Lisää sana sanastoon"
 
 #: ../src/e-util/e-html-editor-actions.c:1619
-#, fuzzy
-#| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
-msgstr "_Väärin kirjoitettujen sanojen väri:"
+msgstr "Ohita väärinkirjoitettu sana"
 
 #: ../src/e-util/e-html-editor-actions.c:1626
 msgid "Add Word To"
@@ -14095,7 +14405,7 @@ msgstr "_Huomioi kirjainkoko"
 msgid "_Wrap Search"
 msgstr "Et_si"
 
-#: ../src/e-util/e-html-editor-find-dialog.c:268
+#: ../src/e-util/e-html-editor-find-dialog.c:262
 msgid "Find"
 msgstr "Etsi"
 
@@ -14166,24 +14476,23 @@ msgid "<b>Link</b>"
 msgstr "<b>Linkki</b>"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:219
+#: ../src/e-util/e-html-editor-link-dialog.c:213
 msgid "_URL:"
 msgstr "_Osoite:"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:668
-#: ../src/e-util/e-html-editor-link-dialog.c:224
-msgid "_Test URL..."
-msgstr "_Testaa osoite..."
+msgid "_Test URL…"
+msgstr "_Testaa osoite…"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:685
 msgid "Image Properties"
 msgstr "Kuvan ominaisuudet"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:248
+#: ../src/e-util/e-html-editor-link-dialog.c:236
 msgid "_Remove Link"
 msgstr "_Poista linkki"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:273
+#: ../src/e-util/e-html-editor-link-dialog.c:261
 msgid "Link Properties"
 msgstr "Linkin ominaisuudet"
 
@@ -14241,12 +14550,12 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Taustakuva</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "_Template:"
 msgstr "_Malli:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:286
+#: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
@@ -14346,10 +14655,8 @@ msgstr "Ohita"
 
 #. Back
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:458
-#, fuzzy
-#| msgid "Go Back"
 msgid "Back"
-msgstr "Siirry takaisin"
+msgstr "Takaisin"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:467
 msgid "<b>Dictionary</b>"
@@ -14385,7 +14692,7 @@ msgstr "Ladataan"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:685
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2418
+#: ../src/e-util/e-webdav-browser.c:2427
 msgid "_Color:"
 msgstr "_Väri:"
 
@@ -14411,32 +14718,32 @@ msgid ""
 "file it is from the list."
 msgstr "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
 
-#: ../src/e-util/e-import-assistant.c:300 ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:301 ../src/e-util/e-import-assistant.c:480
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../src/e-util/e-import-assistant.c:343 ../src/e-util/e-import-assistant.c:956
+#: ../src/e-util/e-import-assistant.c:344 ../src/e-util/e-import-assistant.c:962
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../src/e-util/e-import-assistant.c:368
+#: ../src/e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../src/e-util/e-import-assistant.c:376
+#: ../src/e-util/e-import-assistant.c:379
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../src/e-util/e-import-assistant.c:384
+#: ../src/e-util/e-import-assistant.c:387
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../src/e-util/e-import-assistant.c:406
+#: ../src/e-util/e-import-assistant.c:409
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../src/e-util/e-import-assistant.c:536
+#: ../src/e-util/e-import-assistant.c:541
 #, fuzzy
 #| msgid ""
 #| "Evolution checked for settings to import from the following applications: Pine, "
@@ -14451,40 +14758,40 @@ msgstr ""
 "iCalendar. Mitään tuotavia asetuksia ei löytynyt. Jos haluat kokeilla uudestaan, "
 "napsauta ”Takaisin”-painiketta."
 
-#: ../src/e-util/e-import-assistant.c:562
+#: ../src/e-util/e-import-assistant.c:568
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:808
+#: ../src/e-util/e-import-assistant.c:814
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../src/e-util/e-import-assistant.c:955
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../src/e-util/e-import-assistant.c:961 ../src/e-util/e-import-assistant.c:974
-#: ../src/e-util/e-import-assistant.c:1327 ../src/e-util/e-import-assistant.c:1403
-#: ../src/e-util/e-import-assistant.c:1412
+#: ../src/e-util/e-import-assistant.c:967 ../src/e-util/e-import-assistant.c:980
+#: ../src/e-util/e-import-assistant.c:1333 ../src/e-util/e-import-assistant.c:1410
+#: ../src/e-util/e-import-assistant.c:1419
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../src/e-util/e-import-assistant.c:969
+#: ../src/e-util/e-import-assistant.c:975
 msgid "Select what type of file you want to import from the list."
 msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
 
-#: ../src/e-util/e-import-assistant.c:1317 ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1323 ../src/e-util/e-import-assistant.c:1359
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../src/e-util/e-import-assistant.c:1334 ../src/e-util/e-import-assistant.c:1390
+#: ../src/e-util/e-import-assistant.c:1340 ../src/e-util/e-import-assistant.c:1397
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../src/e-util/e-import-assistant.c:1345
+#: ../src/e-util/e-import-assistant.c:1352
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external "
@@ -14494,19 +14801,19 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista Evolutionin "
 "käyttöön."
 
-#: ../src/e-util/e-import-assistant.c:1362
+#: ../src/e-util/e-import-assistant.c:1369
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../src/e-util/e-import-assistant.c:1372
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../src/e-util/e-import-assistant.c:1381
+#: ../src/e-util/e-import-assistant.c:1388
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-import-assistant.c:1398
+#: ../src/e-util/e-import-assistant.c:1405
 #, fuzzy
 #| msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Click “Apply” to begin importing the file into Evolution."
@@ -14595,40 +14902,40 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
-#: ../src/e-util/e-misc-utils.c:262
+#: ../src/e-util/e-misc-utils.c:278
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../src/e-util/e-misc-utils.c:346
+#: ../src/e-util/e-misc-utils.c:362
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../src/e-util/e-misc-utils.c:2547
+#: ../src/e-util/e-misc-utils.c:2561
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Avataan kalenteria “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2550
+#: ../src/e-util/e-misc-utils.c:2564
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Avataan muistilappuluetteloa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2553
+#: ../src/e-util/e-misc-utils.c:2567
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Avataan tehtävälistaa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2556
+#: ../src/e-util/e-misc-utils.c:2570
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Avataan osoitekirja “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3336
+#: ../src/e-util/e-misc-utils.c:3350
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
 
-#: ../src/e-util/e-misc-utils.c:4189
+#: ../src/e-util/e-misc-utils.c:4244
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -14636,18 +14943,18 @@ msgstr ""
 "Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
 "kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
 
-#: ../src/e-util/e-misc-utils.c:4201
+#: ../src/e-util/e-misc-utils.c:4256
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "Yhteyskäytännön asettaminen versioon LDAPv3 (%d) epäonnistui: %s"
 
-#: ../src/e-util/e-misc-utils.c:4213
+#: ../src/e-util/e-misc-utils.c:4268
 #, fuzzy, c-format
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
-#: ../src/e-util/e-misc-utils.c:4227
+#: ../src/e-util/e-misc-utils.c:4282
 #, fuzzy, c-format
 #| msgid ""
 #| "This LDAP server may use an older version of LDAP, which does not support this "
@@ -14664,7 +14971,7 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4238
+#: ../src/e-util/e-misc-utils.c:4293
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
 "functionality or it may be misconfigured. Ask your administrator for supported "
@@ -14674,12 +14981,12 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4271
+#: ../src/e-util/e-misc-utils.c:4326
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolutionia ei ole koostettu LDAP-tuen kera"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4585
+#: ../src/e-util/e-misc-utils.c:4640
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14687,7 +14994,7 @@ msgstr "Tuntematon (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4594
+#: ../src/e-util/e-misc-utils.c:4649
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -14710,11 +15017,11 @@ msgid "_Search:"
 msgstr "Et_si:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/e-util/e-name-selector-dialog.c:1325
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1702
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:785
-#: ../src/modules/calendar/e-task-shell-view-actions.c:958
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:783
+#: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -14732,25 +15039,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, fuzzy, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Laajenna kaikki"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3268
+#: ../src/e-util/e-name-selector-entry.c:3250
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3261
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3297
+#: ../src/e-util/e-name-selector-entry.c:3279
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
@@ -14780,19 +15087,19 @@ msgstr ""
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock -näppäin on päällä."
 
-#: ../src/e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase"
 msgstr "_Muista salalause"
 
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:578
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr ""
 
-#: ../src/e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password"
 msgstr "_Muista salasana"
 
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:584
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -14905,35 +15212,35 @@ msgstr "Muokkaa sääntöä"
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../src/e-util/e-search-bar.c:611
+#: ../src/e-util/e-search-bar.c:621
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../src/e-util/e-search-bar.c:619
+#: ../src/e-util/e-search-bar.c:629
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../src/e-util/e-search-bar.c:631
+#: ../src/e-util/e-search-bar.c:641
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../src/e-util/e-search-bar.c:658
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../src/e-util/e-search-bar.c:670
+#: ../src/e-util/e-search-bar.c:680
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../src/e-util/e-search-bar.c:679
+#: ../src/e-util/e-search-bar.c:689
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../src/e-util/e-search-bar.c:707
+#: ../src/e-util/e-search-bar.c:717
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../src/e-util/e-search-bar.c:729
+#: ../src/e-util/e-search-bar.c:739
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
@@ -15094,7 +15401,7 @@ msgstr "Tyyppi:"
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1748
+#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1752
 msgid "Name cannot be empty"
 msgstr "Nimi ei voi olla tyhjä"
 
@@ -15118,27 +15425,27 @@ msgstr "Tuotu varmenne"
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../src/e-util/e-source-selector.c:3217
+#: ../src/e-util/e-source-selector.c:3219
 msgid "Show"
 msgstr "Näytä"
 
-#: ../src/e-util/e-source-selector.c:3224
+#: ../src/e-util/e-source-selector.c:3225
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:805
+#: ../src/e-util/e-source-selector.c:3380 ../src/mail/e-mail-display.c:805
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/e-util/e-source-selector.c:3478
+#: ../src/e-util/e-source-selector.c:3380 ../src/e-util/e-source-selector.c:3478
 msgid "_Show"
 msgstr "_Näytä"
 
-#: ../src/e-util/e-source-selector.c:3431
+#: ../src/e-util/e-source-selector.c:3432
 msgid "Manage Groups"
 msgstr "Hallitse ryhmiä"
 
-#: ../src/e-util/e-source-selector.c:3443
+#: ../src/e-util/e-source-selector.c:3444
 msgid "Available Groups:"
 msgstr "Käytettävissä olevat ryhmät:"
 
@@ -15156,8 +15463,8 @@ msgid "(no suggestions)"
 msgstr "(ei ehdotuksia)"
 
 #: ../src/e-util/e-spell-entry.c:503
-msgid "More..."
-msgstr "Lisää..."
+msgid "More…"
+msgstr "Lisää…"
 
 #. + Add to Dictionary
 #: ../src/e-util/e-spell-entry.c:588
@@ -15388,11 +15695,11 @@ msgstr "Tyhjennä k_aikki"
 msgid "_Show field in View"
 msgstr "_Näytä kenttä näkymässä"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1782
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1782
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -15483,60 +15790,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../src/e-util/e-table-header-item.c:1607
+#: ../src/e-util/e-table-header-item.c:1609
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../src/e-util/e-table-header-item.c:1630
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../src/e-util/e-table-header-item.c:1633
+#: ../src/e-util/e-table-header-item.c:1635
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../src/e-util/e-table-header-item.c:1636
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "_Reset sort"
 msgstr "_Palauta järjestys"
 
-#: ../src/e-util/e-table-header-item.c:1639
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../src/e-util/e-table-header-item.c:1646
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../src/e-util/e-table-header-item.c:1649
-msgid "Add a C_olumn..."
-msgstr "Lisää _sarake..."
+#: ../src/e-util/e-table-header-item.c:1651
+msgid "Add a C_olumn…"
+msgstr "Lisää _sarake…"
 
-#: ../src/e-util/e-table-header-item.c:1653
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-table-header-item.c:1656
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../src/e-util/e-table-header-item.c:1659
-msgid "Format Column_s..."
-msgstr "Muotoile _sarakkeet..."
+#: ../src/e-util/e-table-header-item.c:1661
+msgid "Format Column_s…"
+msgstr "Muotoile _sarakkeet…"
 
-#: ../src/e-util/e-table-header-item.c:1663
-msgid "Custo_mize Current View..."
-msgstr "_Mukauta nykyistä näkymää..."
+#: ../src/e-util/e-table-header-item.c:1665
+msgid "Custo_mize Current View…"
+msgstr "_Muokkaa nykyistä näkymää…"
 
-#: ../src/e-util/e-table-header-item.c:1730
+#: ../src/e-util/e-table-header-item.c:1732
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1753
+#: ../src/e-util/e-table-header-item.c:1755
 msgid "_Custom"
 msgstr "_Oma"
 
@@ -15549,9 +15856,9 @@ msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
-#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
-#: ../src/e-util/e-timezone-dialog.c:899
+#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
+#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
+#: ../src/e-util/e-timezone-dialog.c:1015
 msgid "UTC"
 msgstr "UTC"
 
@@ -15581,11 +15888,11 @@ msgstr "_Valinta"
 msgid "Timezone drop-down combination box"
 msgstr "Aikavyöhykkeen valinnan pudotusvalikko"
 
-#: ../src/e-util/e-url-entry.c:106
+#: ../src/e-util/e-url-entry.c:102
 msgid "Click here to open the URL"
 msgstr "Napsauta tästä avataksesi verkko-osoitteen"
 
-#: ../src/e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:104
 msgid "Enter a URL here"
 msgstr "Kirjoita verkko-osoite tähän"
 
@@ -15595,10 +15902,8 @@ msgstr "Evolutionin lähdekatselin"
 
 #. Translators: The name that is displayed in the user interface
 #: ../src/e-util/evolution-source-viewer.c:668
-#, fuzzy
-#| msgid "Display"
 msgid "Display Name"
-msgstr "Näytä"
+msgstr "Näyttönimi"
 
 #: ../src/e-util/evolution-source-viewer.c:677
 #, fuzzy
@@ -15607,136 +15912,133 @@ msgid "Flags"
 msgstr "_Merkki:"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1230
+#: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../src/e-util/e-webdav-browser.c:447
+#: ../src/e-util/e-webdav-browser.c:448
 msgid "Address book"
 msgstr "Osoitekirja"
 
-#: ../src/e-util/e-webdav-browser.c:458
+#: ../src/e-util/e-webdav-browser.c:459
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:514
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1553
+#: ../src/mail/em-folder-tree-model.c:1930
 msgid "Loading…"
 msgstr "Ladataan…"
 
-#: ../src/e-util/e-webdav-browser.c:1383
+#: ../src/e-util/e-webdav-browser.c:1387
 msgid "Searching collection children…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1385
+#: ../src/e-util/e-webdav-browser.c:1389
 msgid "Failed to search for collection children"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1419
+#: ../src/e-util/e-webdav-browser.c:1423
 msgid "Searching for user home, please wait…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1421
+#: ../src/e-util/e-webdav-browser.c:1425
 #, fuzzy
 #| msgid "Unable to perform search."
 msgid "Failed to search for user home"
 msgstr "Hakua ei voi suorittaa."
 
-#: ../src/e-util/e-webdav-browser.c:1763
+#: ../src/e-util/e-webdav-browser.c:1768
 msgid "At least one component type should be set"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1781
+#: ../src/e-util/e-webdav-browser.c:1787
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to get selected collection HREF"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1812
-msgid "Saving changes…"
-msgstr "Tallennetaan muutoksia…"
-
-#: ../src/e-util/e-webdav-browser.c:1813
+#: ../src/e-util/e-webdav-browser.c:1819
 msgid "Failed to save changes"
 msgstr "Muutoksia ei voitu tallentaa"
 
-#: ../src/e-util/e-webdav-browser.c:1815
+#: ../src/e-util/e-webdav-browser.c:1821
 msgid "Creating new book…"
 msgstr "Luodaan uutta kirjaa…"
 
-#: ../src/e-util/e-webdav-browser.c:1816
+#: ../src/e-util/e-webdav-browser.c:1822
 msgid "Failed to create new book"
 msgstr "Uuden kirjan luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1824
 msgid "Creating new calendar…"
 msgstr "Luodaan uutta kalenteria…"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1825
 msgid "Failed to create new calendar"
 msgstr "Uuden kalenterin luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1827
 msgid "Creating new collection…"
 msgstr "Luodaan uutta kokoelmaa…"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1828
 msgid "Failed to create new collection"
 msgstr "Uuden kokoelman luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1961
+#: ../src/e-util/e-webdav-browser.c:1967
 msgid "It is not allowed to create book under another book or calendar"
 msgstr ""
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1963
+#: ../src/e-util/e-webdav-browser.c:1969
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2189
+#: ../src/e-util/e-webdav-browser.c:2198
 msgid "Deleting book…"
 msgstr "Poistetaan kirjaa…"
 
-#: ../src/e-util/e-webdav-browser.c:2190
+#: ../src/e-util/e-webdav-browser.c:2199
 msgid "Failed to delete book"
 msgstr "Kirjan poistaminen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2193
+#: ../src/e-util/e-webdav-browser.c:2202
 msgid "Deleting calendar…"
 msgstr "Poistetaan kalenteri…"
 
-#: ../src/e-util/e-webdav-browser.c:2194
+#: ../src/e-util/e-webdav-browser.c:2203
 msgid "Failed to delete calendar"
 msgstr "Kalenterin poisto epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2197
+#: ../src/e-util/e-webdav-browser.c:2206
 msgid "Deleting collection…"
 msgstr "Poistetaan kokoelmaa…"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2207
 msgid "Failed to delete collection"
 msgstr "Kokoelman poistaminen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2429
+#: ../src/e-util/e-webdav-browser.c:2438
 msgid "For Components:"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2435
+#: ../src/e-util/e-webdav-browser.c:2444
 msgid "_Events"
 msgstr "_Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:2625
+#: ../src/e-util/e-webdav-browser.c:2634
 msgid "WebDAV server:"
 msgstr "WebDAV-palvelin:"
 
-#: ../src/e-util/e-webdav-browser.c:2660
+#: ../src/e-util/e-webdav-browser.c:2669
 msgid "Create _Book"
 msgstr "Luo ki_rja"
 
-#: ../src/e-util/e-webdav-browser.c:2667
+#: ../src/e-util/e-webdav-browser.c:2676
 msgid "Create _Calendar"
 msgstr "_Luo kalenteri"
 
-#: ../src/e-util/e-webdav-browser.c:2674
+#: ../src/e-util/e-webdav-browser.c:2683
 msgid "Create Collectio_n"
 msgstr "Luo _kokoelma"
 
@@ -15761,16 +16063,12 @@ msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
 #: ../src/e-util/e-web-view.c:433
-#, fuzzy
-#| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
-msgstr "Kopioi _sähköpostiosoite"
+msgstr "Kopioi _raakasähköpostiosoite"
 
 #: ../src/e-util/e-web-view.c:435
-#, 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"
+msgstr "Kopioi raakasähköpostiosoite leikepöydälle"
 
 #: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
@@ -15781,67 +16079,69 @@ msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
 #: ../src/e-util/e-web-view.c:457
-msgid "Save _Image..."
-msgstr "Tal_lenna kuva..."
+msgid "Save _Image…"
+msgstr "Tallenna _kuva…"
 
 #: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-reader.c:2787
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
+#: ../src/mail/e-mail-reader.c:2820
 msgid "Search _Web…"
 msgstr "Etsi _verkosta…"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-reader.c:2789
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
+#: ../src/mail/e-mail-reader.c:2822
 #, fuzzy
 #| msgid "Send a message to the selected contacts"
 msgid "Search the Web with the selected text"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2102
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../src/e-util/e-web-view.c:1446
+#: ../src/e-util/e-web-view.c:1451
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../src/e-util/e-web-view.c:1448
+#: ../src/e-util/e-web-view.c:1453
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../src/e-util/e-web-view.c:1459
+#: ../src/e-util/e-web-view.c:1464
 #, fuzzy, c-format
 #| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/e-util/e-web-view.c:1461
+#: ../src/e-util/e-web-view.c:1466
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/e-util/e-web-view.c:1465
+#: ../src/e-util/e-web-view.c:1470
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../src/e-util/e-web-view.c:4128
+#: ../src/e-util/e-web-view.c:4157
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:4316
+#: ../src/e-util/e-web-view.c:4345
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/e-util/e-web-view.c:4353
+#: ../src/e-util/e-web-view.c:4382
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../src/e-util/e-web-view.c:4500
+#: ../src/e-util/e-web-view.c:4529
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -16165,50 +16465,50 @@ msgid "Invalid folder URI “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1164 ../src/mail/em-folder-tree-model.c:1237
-#: ../src/mail/importers/kmail-libs.c:139
+#: ../src/libemail-engine/e-mail-session.c:120
+#: ../src/mail/em-folder-properties.c:1444 ../src/mail/em-folder-tree-model.c:1501
+#: ../src/mail/importers/kmail-libs.c:138
 #: ../src/modules/mail/e-mail-shell-view-private.c:1032
 #: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:118
-#: ../src/mail/em-folder-tree-model.c:1230 ../src/mail/importers/kmail-libs.c:145
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1495 ../src/mail/importers/kmail-libs.c:144
 #: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:119
-#: ../src/mail/em-folder-tree-model.c:1241 ../src/mail/importers/kmail-libs.c:141
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1505 ../src/mail/importers/kmail-libs.c:140
 #: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-tree-model.c:1245 ../src/mail/importers/kmail-libs.c:143
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1509 ../src/mail/importers/kmail-libs.c:142
 #: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1233
-#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/importers/kmail-libs.c:146
 #: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../src/libemail-engine/e-mail-session.c:1294
+#: ../src/libemail-engine/e-mail-session.c:1519
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../src/libemail-engine/e-mail-session.c:1351
+#: ../src/libemail-engine/e-mail-session.c:1580
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been cancelled."
@@ -16216,26 +16516,26 @@ msgid ""
 "No destination address provided, forwarding of the message has been cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../src/libemail-engine/e-mail-session.c:1364
+#: ../src/libemail-engine/e-mail-session.c:1593
 #, 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."
 
-#: ../src/libemail-engine/e-mail-session.c:1516
+#: ../src/libemail-engine/e-mail-session.c:1794
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1636
+#: ../src/libemail-engine/e-mail-session.c:1914
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1638
+#: ../src/libemail-engine/e-mail-session.c:1916
 msgid "Looking up recipient PGP keys in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:2639
+#: ../src/libemail-engine/e-mail-session.c:2963
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for “%s”"
@@ -16295,22 +16595,19 @@ msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:188
-#, fuzzy, c-format
-#| msgid "Disconnecting from '%s'"
+#, c-format
 msgid "Disconnecting from “%s”"
-msgstr "Katkaistaan yhteys kohteeseen ”%s”"
+msgstr "Katkaistaan yhteys kohteeseen “%s”"
 
-#: ../src/libemail-engine/e-mail-store-utils.c:264
-#, fuzzy, c-format
-#| msgid "Reconnecting to '%s'"
+#: ../src/libemail-engine/e-mail-store-utils.c:264 ../src/mail/e-mail-backend.c:1048
+#, c-format
 msgid "Reconnecting to “%s”"
-msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
+msgstr "Yhdistetään uudelleen kohteeseen “%s”"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:349 ../src/mail/mail-send-recv.c:1089
-#, fuzzy, c-format
-#| msgid "Preparing account '%s' for offline"
+#, c-format
 msgid "Preparing account “%s” for offline"
-msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
+msgstr "Valmistellaan tiliä “%s” yhteydettömään tilaan"
 
 #: ../src/libemail-engine/mail-ops.c:87
 msgid "Filtering Selected Messages"
@@ -16326,10 +16623,9 @@ msgid ""
 msgstr ""
 
 #: ../src/libemail-engine/mail-ops.c:225
-#, fuzzy, c-format
-#| msgid "Fetching mail from '%s'"
+#, c-format
 msgid "Fetching mail from “%s”"
-msgstr "Noudetaan viestejä kohteesta '%s'"
+msgstr "Noudetaan viestejä kohteesta “%s”"
 
 #: ../src/libemail-engine/mail-ops.c:737
 #, c-format
@@ -16364,22 +16660,19 @@ msgid "Complete."
 msgstr "Valmis."
 
 #: ../src/libemail-engine/mail-ops.c:1220
-#, fuzzy, c-format
-#| msgid "Moving messages to '%s'"
+#, c-format
 msgid "Moving messages to “%s”"
-msgstr "Siirretään viestejä kansioon ”%s”"
+msgstr "Siirretään viestejä kansioon “%s”"
 
 #: ../src/libemail-engine/mail-ops.c:1221
-#, fuzzy, c-format
-#| msgid "Copying messages to '%s'"
+#, c-format
 msgid "Copying messages to “%s”"
-msgstr "Kopioidaan viestejä kansioon ”%s”"
+msgstr "Kopioidaan viestejä kansioon “%s”"
 
 #: ../src/libemail-engine/mail-ops.c:1340
-#, fuzzy, c-format
-#| msgid "Storing folder '%s'"
+#, c-format
 msgid "Storing folder “%s”"
-msgstr "Tallennetaan kansiota %s"
+msgstr "Tallennetaan kansiota “%s”"
 
 #: ../src/libemail-engine/mail-ops.c:1468
 #, fuzzy, c-format
@@ -16388,10 +16681,9 @@ msgid "Expunging and storing account “%s”"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
 #: ../src/libemail-engine/mail-ops.c:1469
-#, fuzzy, c-format
-#| msgid "Storing account '%s'"
+#, c-format
 msgid "Storing account “%s”"
-msgstr "Tallennetaan tiliä ”%s”"
+msgstr "Tallennetaan tiliä “%s”"
 
 #: ../src/libemail-engine/mail-ops.c:1544
 #, fuzzy, c-format
@@ -16417,9 +16709,10 @@ msgstr ""
 
 #. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
 #: ../src/libemail-engine/mail-tools.c:198
-#, c-format
-msgid "[Fwd: %s]"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "From: %s"
+msgid "Fwd: %s"
+msgstr "Lähettäjä: %s"
 
 #. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
 #. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
@@ -16428,10 +16721,9 @@ msgid "No Subject"
 msgstr "Ei aihetta"
 
 #: ../src/libemail-engine/mail-tools.c:283
-#, fuzzy, c-format
-#| msgid "Forwarded message - %s"
+#, c-format
 msgid "Forwarded message — %s"
-msgstr "Välitetty viesti - %s"
+msgstr "Välitetty viesti — %s"
 
 #: ../src/libemail-engine/mail-tools.c:285
 msgid "Forwarded message"
@@ -16477,24 +16769,24 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
 
-#: ../src/mail/e-mail-account-manager.c:118 ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:118 ../src/mail/e-mail-account-manager.c:206
 msgid "Open _Online Accounts"
 msgstr "Avaa _verkkotilit"
 
-#: ../src/mail/e-mail-account-manager.c:144 ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:144 ../src/mail/e-mail-account-manager.c:232
 msgid "This account was created through the Online Accounts service."
 msgstr "Tämä tili luotiin verkkotilipalvelun kautta."
 
-#: ../src/mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:692
 msgid "_Reset Order"
 msgstr "_Palauta järjestys"
 
-#: ../src/mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:705
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
 "Voit vetää ja tippuuttaa tilinimiä määrittääksesi niiden järjestyksen uudelleen."
 
-#: ../src/mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:748
 msgid "De_fault"
 msgstr "_Oletustili"
 
@@ -16503,66 +16795,66 @@ msgstr "_Oletustili"
 msgid "Invalid URI: “%s”"
 msgstr "Virheellinen URI: “%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:754
+#: ../src/mail/e-mail-autoconfig.c:756
 #, c-format
 msgid "Host: %s:%d"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:758
+#: ../src/mail/e-mail-autoconfig.c:760
 #, c-format
 msgid "User: %s"
 msgstr "Käyttäjä: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:762
+#: ../src/mail/e-mail-autoconfig.c:764
 #, c-format
 msgid "Security method: %s"
 msgstr "Salaustapa: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:763 ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:765 ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:764 ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:766 ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:768
+#: ../src/mail/e-mail-autoconfig.c:770
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Tunnistautumismekanismi: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:948
+#: ../src/mail/e-mail-autoconfig.c:950
 msgid "No email address provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../src/mail/e-mail-autoconfig.c:957
+#: ../src/mail/e-mail-autoconfig.c:959
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../src/mail/e-mail-autoconfig.c:1307
+#: ../src/mail/e-mail-autoconfig.c:1309
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1314
+#: ../src/mail/e-mail-autoconfig.c:1316
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1321
+#: ../src/mail/e-mail-autoconfig.c:1323
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
-#: ../src/mail/e-mail-browser.c:133 ../src/shell/e-shell-window-actions.c:819
-#: ../src/shell/e-shell-window-actions.c:826
-#: ../src/shell/e-shell-window-actions.c:833
+#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:837
+#: ../src/shell/e-shell-window-actions.c:844
+#: ../src/shell/e-shell-window-actions.c:851
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-browser.c:294
+#: ../src/mail/e-mail-browser.c:314
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -16585,8 +16877,8 @@ msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
 #: ../src/mail/e-mail-config-auth-check.c:217
-msgid "Querying authentication types..."
-msgstr "Kysellään tunnistautumistyyppejä..."
+msgid "Querying authentication types…"
+msgstr "Kysellään tunnistautumistyyppejä…"
 
 #: ../src/mail/e-mail-config-auth-check.c:430
 msgid "Check for Supported Types"
@@ -16639,8 +16931,6 @@ msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
 #: ../src/mail/e-mail-config-composing-page.c:467
-#, fuzzy
-#| msgid "_Reply style:"
 msgid "Re_ply style:"
 msgstr "_Vastaustyyli:"
 
@@ -16654,17 +16944,13 @@ msgid "Language for Reply and Forward attribution text"
 msgstr ""
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4273 ../src/mail/mail-config.ui.h:22
-#, fuzzy
-#| msgid "Start _typing at the bottom on replying"
+#: ../src/mail/em-composer-utils.c:4145 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
-msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
+msgstr "Aloita _kirjoittaminen lopusta"
 
 #: ../src/mail/e-mail-config-composing-page.c:531 ../src/mail/mail-config.ui.h:23
-#, fuzzy
-#| msgid "_Keep signature above the original message on replying"
 msgid "_Keep signature above the original message"
-msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
+msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä"
 
 #: ../src/mail/e-mail-config-composing-page.c:548
 msgid "Message Receipts"
@@ -16686,7 +16972,7 @@ msgstr "Aina"
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../src/mail/e-mail-config-confirm-page.c:154
+#: ../src/mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -16700,13 +16986,13 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi napsauttamalla painiketta “Toteuta”."
 
-#: ../src/mail/e-mail-config-confirm-page.c:166
+#: ../src/mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Valmis"
 
 #: ../src/mail/e-mail-config-defaults-page.c:314
-msgid "Checking server settings..."
-msgstr "Tarkistetaan palvelimen asetuksia..."
+msgid "Checking server settings…"
+msgstr "Tarkistetaan palvelimen asetuksia…"
 
 #: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
@@ -16793,7 +17079,7 @@ msgstr ""
 "eivät ole pakollisia, mutta täyttämällä kyseiset kentät voit lisätä tiedot "
 "lähettämiisi sähköpostiviesteihin."
 
-#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-identity-page.c:580
 #: ../src/mail/e-mail-config-summary-page.c:353
 #, fuzzy
 #| msgid ""
@@ -16806,73 +17092,73 @@ msgstr ""
 "Yllä olevaa nimeä käytetään tilin yksilöintiin.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtainen\""
 
-#: ../src/mail/e-mail-config-identity-page.c:596
+#: ../src/mail/e-mail-config-identity-page.c:597
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: ../src/mail/e-mail-config-identity-page.c:605
+#: ../src/mail/e-mail-config-identity-page.c:606
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../src/mail/e-mail-config-identity-page.c:634
+#: ../src/mail/e-mail-config-identity-page.c:635
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/mail/e-mail-config-identity-page.c:684
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: ../src/mail/e-mail-config-identity-page.c:692
+#: ../src/mail/e-mail-config-identity-page.c:693
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../src/mail/e-mail-config-identity-page.c:721
+#: ../src/mail/e-mail-config-identity-page.c:722
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../src/mail/e-mail-config-identity-page.c:776
-msgid "Add Ne_w Signature..."
-msgstr "Lisää uusi _allekirjoitus..."
+#: ../src/mail/e-mail-config-identity-page.c:777
+msgid "Add Ne_w Signature…"
+msgstr "Lisää uusi _allekirjoitus…"
 
-#: ../src/mail/e-mail-config-identity-page.c:790
+#: ../src/mail/e-mail-config-identity-page.c:791
 msgid "A_liases:"
 msgstr "_Aliakset:"
 
-#: ../src/mail/e-mail-config-identity-page.c:862
+#: ../src/mail/e-mail-config-identity-page.c:863
 msgid "Edi_t"
 msgstr "_Muokkaa"
 
-#: ../src/mail/e-mail-config-identity-page.c:885
+#: ../src/mail/e-mail-config-identity-page.c:886
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "_Etsi postipalvelimen tiedot pohjautuen sähköpostiosoitteeseen"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:935
 msgid "Full Name should not be empty"
 msgstr "Koko nimi ei voi olla tyhjä"
 
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:942
 msgid "Email Address cannot be empty"
 msgstr "Sähköpostiosoite ei voi olla tyhjä"
 
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:947
 msgid "Email Address is not a valid email"
 msgstr "Sähköpostiosoite ei ole kelvollinen osoite"
 
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:959
 msgid "Reply To is not a valid email"
 msgstr "Vastausosoite ei ole kelvollinen osoite"
 
-#: ../src/mail/e-mail-config-identity-page.c:969
+#: ../src/mail/e-mail-config-identity-page.c:970
 #: ../src/mail/e-mail-config-summary-page.c:638
 msgid "Account Name cannot be empty"
 msgstr "Tilin nimi ei voi olla tyhjä"
 
 #: ../src/mail/e-mail-config-lookup-page.c:65
-msgid "Looking up account details..."
-msgstr "Etsitään tilin tietoja..."
+msgid "Looking up account details…"
+msgstr "Etsitään tilin tietoja…"
 
 #: ../src/mail/e-mail-config-provider-page.c:538
 msgid "Checking for New Mail"
@@ -16899,11 +17185,11 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:643
+#: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:771
+#: ../src/modules/mail/e-mail-shell-backend.c:802
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Yleiset"
@@ -16979,7 +17265,7 @@ msgstr "Valitse"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
@@ -17000,10 +17286,8 @@ msgid "Always encrypt outgoing messages when using this account"
 msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
 
 #: ../src/mail/e-mail-config-security-page.c:805
-#, fuzzy
-#| msgid "Always encrypt to _myself when sending encrypted messages"
 msgid "Always encrypt to myself when sending encrypted messages"
-msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
+msgstr "Salaa aina myös itselle lähetettäessä salattu viesti"
 
 #: ../src/mail/e-mail-config-sending-page.c:50
 msgid "Sending Email"
@@ -17064,7 +17348,7 @@ msgstr ""
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
-#: ../src/mail/e-mail-config-welcome-page.c:161
+#: ../src/mail/e-mail-config-welcome-page.c:162
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -17074,7 +17358,7 @@ msgstr ""
 "\n"
 "Aloita napsauttamalla “Jatka”."
 
-#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/mail/e-mail-config-welcome-page.c:172
 #: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "Tervetuloa"
@@ -17084,8 +17368,8 @@ msgid "Account Editor"
 msgstr "Tilimuokkain"
 
 #: ../src/mail/e-mail-display.c:126
-msgid "_Add to Address Book..."
-msgstr "_Lisää osoitekirjaan..."
+msgid "_Add to Address Book…"
+msgstr "_Lisää osoitekirjaan…"
 
 #: ../src/mail/e-mail-display.c:133
 msgid "_To This Address"
@@ -17096,7 +17380,9 @@ msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
 #: ../src/mail/e-mail-display.c:147
-msgid "Send _Reply To..."
+#, fuzzy
+#| msgid "Send _Reply To..."
+msgid "Send _Reply To…"
 msgstr "Lähetä _vastaus osoitteeseen..."
 
 #: ../src/mail/e-mail-display.c:149
@@ -17153,6 +17439,32 @@ msgstr "_Luo"
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#, fuzzy
+#| msgid "Folder Properties"
+msgid "Folder Sort Order"
+msgstr "Kansion ominaisuudet"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Reset c_urrent level"
+msgstr "Sulje nykyinen tiedosto"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+msgid "Reset sort order in the current level to the defaults"
+msgstr ""
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#, fuzzy
+#| msgid "Select all headers"
+msgid "Reset _all levels"
+msgstr "Valitse kaikki otsakkeet"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+msgid "Reset sort order in all levels to their defaults"
+msgstr ""
+
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../src/mail/e-mail-free-form-exp.c:231
@@ -17189,14 +17501,14 @@ msgctxt "ffe"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../src/mail/e-mail-free-form-exp.c:484
+#: ../src/mail/e-mail-free-form-exp.c:489
 #, fuzzy
 #| msgid "now"
 msgctxt "ffe"
 msgid "no"
 msgstr "nyt"
 
-#: ../src/mail/e-mail-free-form-exp.c:485
+#: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr ""
@@ -17234,11 +17546,11 @@ msgid "_Later"
 msgstr "_Myöhemmin"
 
 #: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:855
+#: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:882
+#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:1168
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
@@ -17267,8 +17579,8 @@ msgid "Cannot find message in its folder summary"
 msgstr "Kopioidaan viestejä kansioon %s"
 
 #: ../src/mail/e-mail-notes.c:863
-msgid "Storing changes..."
-msgstr "Tallennetaan muutoksia..."
+msgid "Storing changes…"
+msgstr "Tallennetaan muutoksia…"
 
 #: ../src/mail/e-mail-notes.c:1001
 #, fuzzy
@@ -17276,9 +17588,9 @@ msgstr "Tallennetaan muutoksia..."
 msgid "Edit Message Note"
 msgstr "_Muokkaa viestiä"
 
-#: ../src/mail/e-mail-notes.c:1159
-msgid "Retrieving message..."
-msgstr "Noudetaan viestiä..."
+#: ../src/mail/e-mail-notes.c:1157
+msgid "Retrieving message…"
+msgstr "Noudetaan viestiä…"
 
 #: ../src/mail/e-mail-print-config-headers.c:166
 #, fuzzy
@@ -17343,679 +17655,703 @@ msgid "C_opy"
 msgstr "_Kopioi"
 
 #: ../src/mail/e-mail-reader.c:610
-msgid "Deleting message note..."
+#, fuzzy
+#| msgid "Deleting message note..."
+msgid "Deleting message note…"
 msgstr "Poistetaan viestin huomautus..."
 
-#: ../src/mail/e-mail-reader.c:1577 ../src/mail/e-mail-reader.c:1868
-#: ../src/mail/e-mail-reader.c:1908
+#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
+#: ../src/mail/e-mail-reader.c:1941
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../src/mail/e-mail-reader.c:1914
+#: ../src/mail/e-mail-reader.c:1947
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../src/mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2151
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
+#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä “%s”"
 
-#: ../src/mail/e-mail-reader.c:2365
+#: ../src/mail/e-mail-reader.c:2398
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2400
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2372
-msgid "_Archive..."
-msgstr "_Arkistoi..."
+#: ../src/mail/e-mail-reader.c:2405
+msgid "_Archive…"
+msgstr "_Arkistoi…"
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2407
 #, 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"
 
-#: ../src/mail/e-mail-reader.c:2379
+#: ../src/mail/e-mail-reader.c:2412
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2414
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2386
-#, fuzzy
-#| msgid "Assign Color"
+#: ../src/mail/e-mail-reader.c:2419
 msgid "Assign C_olor…"
-msgstr "Aseta väri"
+msgstr "Aseta _väri…"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2421
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Assign color for the selected messages"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2393
+#: ../src/mail/e-mail-reader.c:2426
 #, fuzzy
 #| msgid "Unset Color"
 msgid "Unse_t Color"
 msgstr "Poista värin asetus"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2428
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Unset color for the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2400
-msgid "_Copy to Folder..."
-msgstr "_Kopioi kansioon..."
+#: ../src/mail/e-mail-reader.c:2433
+msgid "_Copy to Folder…"
+msgstr "K_opioi kansioon…"
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2440
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../src/mail/e-mail-reader.c:2414
-msgid "_Add note..."
+#: ../src/mail/e-mail-reader.c:2447
+#, fuzzy
+#| msgid "_Add note..."
+msgid "_Add note…"
 msgstr "_Lisää huomautus..."
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2449
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Add a note for the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2454
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2456
 #, fuzzy
 #| msgid "Create a new event from the selected message"
 msgid "Delete the note for the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2428
-msgid "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2461
+#, fuzzy
+#| msgid "_Edit note..."
+msgid "_Edit note…"
 msgstr "_Muokkaa huomautusta..."
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2463
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Edit a note for the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2435
-msgid "Create a Filter Rule for Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2468
+#, fuzzy
+#| msgid "Create a Filter Rule for Mailing _List..."
+msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2470
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
 
-#: ../src/mail/e-mail-reader.c:2442
-msgid "Create a Filter Rule for _Recipients..."
+#: ../src/mail/e-mail-reader.c:2475
+#, fuzzy
+#| msgid "Create a Filter Rule for _Recipients..."
+msgid "Create a Filter Rule for _Recipients…"
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2477
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:2449
-msgid "Create a Filter Rule for Se_nder..."
+#: ../src/mail/e-mail-reader.c:2482
+#, fuzzy
+#| msgid "Create a Filter Rule for Se_nder..."
+msgid "Create a Filter Rule for Se_nder…"
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2484
 msgid "Create a rule to filter messages from this sender"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
 
-#: ../src/mail/e-mail-reader.c:2456
-msgid "Create a Filter Rule for _Subject..."
+#: ../src/mail/e-mail-reader.c:2489
+#, fuzzy
+#| msgid "Create a Filter Rule for _Subject..."
+msgid "Create a Filter Rule for _Subject…"
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a rule to filter messages with this subject"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
 
-#: ../src/mail/e-mail-reader.c:2463
+#: ../src/mail/e-mail-reader.c:2496
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../src/mail/e-mail-reader.c:2470
-msgid "_Find in Message..."
-msgstr "_Etsi viestistä..."
+#: ../src/mail/e-mail-reader.c:2503
+msgid "_Find in Message…"
+msgstr "_Etsi viestistä…"
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/e-mail-reader.c:2477
+#: ../src/mail/e-mail-reader.c:2510
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2512
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../src/mail/e-mail-reader.c:2484
+#: ../src/mail/e-mail-reader.c:2517
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2519
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2491
-msgid "Follow _Up..."
-msgstr "_Vastaa viestiin..."
+#: ../src/mail/e-mail-reader.c:2524
+#, fuzzy
+#| msgid "Follow Up"
+msgid "Follow _Up…"
+msgstr "Lähetä edelleen"
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2526
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2531
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
+#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2538
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2545
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
+#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ../src/mail/e-mail-reader.c:2519
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2559
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
+#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../src/mail/e-mail-reader.c:2533
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2573
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2549
+#: ../src/mail/e-mail-reader.c:2582
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../src/mail/e-mail-reader.c:2556
+#: ../src/mail/e-mail-reader.c:2589
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2598
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2603 ../src/mail/e-mail-reader.c:3019
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2605
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2610
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2612
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2617
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2624
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2593
+#: ../src/mail/e-mail-reader.c:2626
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2631
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/mail/e-mail-reader.c:2600
+#: ../src/mail/e-mail-reader.c:2633
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/mail/e-mail-reader.c:2607
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3010
+#: ../src/mail/e-mail-reader.c:2645 ../src/mail/e-mail-reader.c:3043
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2614
+#: ../src/mail/e-mail-reader.c:2647
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2652
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../src/mail/e-mail-reader.c:2621
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2659
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../src/mail/e-mail-reader.c:2628
+#: ../src/mail/e-mail-reader.c:2661
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2666
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
-msgid "_Edit as New Message..."
-msgstr "_Muokkaa uutena viestinä..."
+msgid "_Edit as New Message…"
+msgstr "_Muokkaa uutena viestinä…"
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2668
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../src/mail/e-mail-reader.c:2640
+#: ../src/mail/e-mail-reader.c:2673
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2680
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2654
-msgid "_Move to Folder..."
-msgstr "_Siirrä kansioon..."
+#: ../src/mail/e-mail-reader.c:2687
+msgid "_Move to Folder…"
+msgstr "_Siirrä kansioon…"
 
-#: ../src/mail/e-mail-reader.c:2656
+#: ../src/mail/e-mail-reader.c:2689
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2694
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2663
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2701
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2708
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../src/mail/e-mail-reader.c:2677
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2715
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2684
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2722
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2691
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2729
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2698
+#: ../src/mail/e-mail-reader.c:2731
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2736
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2705
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2743
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2712
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2719
+#: ../src/mail/e-mail-reader.c:2752
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../src/mail/e-mail-reader.c:2726
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2764
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../src/mail/e-mail-reader.c:2733
+#: ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../src/mail/e-mail-reader.c:2738
+#: ../src/mail/e-mail-reader.c:2771
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../src/mail/e-mail-reader.c:2740
+#: ../src/mail/e-mail-reader.c:2773
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2778
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../src/mail/e-mail-reader.c:2747
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4099
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../src/mail/e-mail-reader.c:2754
+#: ../src/mail/e-mail-reader.c:2787
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:2759
+#: ../src/mail/e-mail-reader.c:2792
 msgid "Al_ternative Reply…"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2761
+#: ../src/mail/e-mail-reader.c:2794
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Choose reply options for the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
+#: ../src/mail/e-mail-reader.c:2799 ../src/mail/em-composer-utils.c:4094
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../src/mail/e-mail-reader.c:2768
+#: ../src/mail/e-mail-reader.c:2801
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
 
-#: ../src/mail/e-mail-reader.c:2773
+#: ../src/mail/e-mail-reader.c:2806
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2775
+#: ../src/mail/e-mail-reader.c:2808
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2780
-msgid "_Save as mbox..."
-msgstr "_Tallenna mbox-muodossa..."
+#: ../src/mail/e-mail-reader.c:2813
+msgid "_Save as mbox…"
+msgstr "_Tallenna mbox-muodossa…"
 
-#: ../src/mail/e-mail-reader.c:2782
+#: ../src/mail/e-mail-reader.c:2815
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2827
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2796
+#: ../src/mail/e-mail-reader.c:2829
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2808
+#: ../src/mail/e-mail-reader.c:2841
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../src/mail/e-mail-reader.c:2810
+#: ../src/mail/e-mail-reader.c:2843
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2848
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/mail/e-mail-reader.c:2817
+#: ../src/mail/e-mail-reader.c:2850
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/mail/e-mail-reader.c:2855
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../src/mail/e-mail-reader.c:2824
+#: ../src/mail/e-mail-reader.c:2857
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2831
+#: ../src/mail/e-mail-reader.c:2864
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2838
+#: ../src/mail/e-mail-reader.c:2871
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../src/mail/e-mail-reader.c:2845
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../src/mail/e-mail-reader.c:2852
+#: ../src/mail/e-mail-reader.c:2885
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../src/mail/e-mail-reader.c:2859
+#: ../src/mail/e-mail-reader.c:2892
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../src/mail/e-mail-reader.c:2866
+#: ../src/mail/e-mail-reader.c:2899
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:2873
+#: ../src/mail/e-mail-reader.c:2906
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../src/mail/e-mail-reader.c:2880
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../src/mail/e-mail-reader.c:2887
+#: ../src/mail/e-mail-reader.c:2920
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../src/mail/e-mail-reader.c:2894
+#: ../src/mail/e-mail-reader.c:2927
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../src/mail/e-mail-reader.c:2904
-msgid "Create a Search Folder from Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2937
+#, fuzzy
+#| msgid "Create a Search Folder from Mailing _List..."
+msgid "Create a Search Folder from Mailing _List…"
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2939
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../src/mail/e-mail-reader.c:2911
-msgid "Create a Search Folder from Recipien_ts..."
+#: ../src/mail/e-mail-reader.c:2944
+#, fuzzy
+#| msgid "Create a Search Folder from Recipien_ts..."
+msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2946
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../src/mail/e-mail-reader.c:2918
-msgid "Create a Search Folder from Sen_der..."
+#: ../src/mail/e-mail-reader.c:2951
+#, fuzzy
+#| msgid "Create a Search Folder from Sen_der..."
+msgid "Create a Search Folder from Sen_der…"
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../src/mail/e-mail-reader.c:2925
-msgid "Create a Search Folder from S_ubject..."
+#: ../src/mail/e-mail-reader.c:2958
+#, fuzzy
+#| msgid "Create a Search Folder from S_ubject..."
+msgid "Create a Search Folder from S_ubject…"
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../src/mail/e-mail-reader.c:2974
-msgid "Mark for Follo_w Up..."
+#: ../src/mail/e-mail-reader.c:3007
+#, fuzzy
+#| msgid "Mark for Follo_w Up..."
+msgid "Mark for Follo_w Up…"
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3027
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3031
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:3002
+#: ../src/mail/e-mail-reader.c:3035
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/mail/e-mail-reader.c:3066
+#: ../src/mail/e-mail-reader.c:3099
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../src/mail/e-mail-reader.c:3068
+#: ../src/mail/e-mail-reader.c:3101
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
-#: ../src/mail/e-mail-reader.c:3074
+#: ../src/mail/e-mail-reader.c:3107
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../src/mail/e-mail-reader.c:3076
+#: ../src/mail/e-mail-reader.c:3109
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../src/mail/e-mail-reader.c:3647
+#: ../src/mail/e-mail-reader.c:3680
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../src/mail/e-mail-reader.c:4951
+#: ../src/mail/e-mail-reader.c:5041
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../src/mail/e-mail-reader.c:4952
+#: ../src/mail/e-mail-reader.c:5042
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
@@ -18024,52 +18360,52 @@ msgstr "Välitä edelleen valitut viestit jollekulle"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4971
+#: ../src/mail/e-mail-reader.c:5061
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:4972
+#: ../src/mail/e-mail-reader.c:5062
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:5038 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5128 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/mail/e-mail-reader.c:5050
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/mail/e-mail-reader.c:5140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/mail/e-mail-reader.c:5054
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/mail/e-mail-reader.c:5144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/mail/e-mail-reader.c:5063 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../src/mail/e-mail-reader.c:6218
+#: ../src/mail/e-mail-reader.c:6308
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:6220
+#: ../src/mail/e-mail-reader.c:6310
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:6237
+#: ../src/mail/e-mail-reader.c:6327
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Salli etäsisältö lähettäjältä %s"
 
-#: ../src/mail/e-mail-reader.c:6254
+#: ../src/mail/e-mail-reader.c:6344
 msgid "Do not show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../src/mail/e-mail-reader.c:6306
+#: ../src/mail/e-mail-reader.c:6396
 msgid "Load remote content"
 msgstr "Lataa etäsisältö"
 
@@ -18106,13 +18442,13 @@ msgstr ""
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../src/mail/e-mail-reader-utils.c:1601
+#: ../src/mail/e-mail-reader-utils.c:1602
 msgid "Printing"
 msgstr "Tulostetaan"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1838
+#: ../src/mail/e-mail-reader-utils.c:1839
 #, fuzzy, c-format
 #| msgid ""
 #| "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
@@ -18128,7 +18464,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 
-#: ../src/mail/e-mail-reader-utils.c:2924
+#: ../src/mail/e-mail-reader-utils.c:2925
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -18139,17 +18475,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".
-#: ../src/mail/e-mail-reader-utils.c:2945
+#: ../src/mail/e-mail-reader-utils.c:2946
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../src/mail/e-mail-reader-utils.c:3359
+#: ../src/mail/e-mail-reader-utils.c:3360
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
-#: ../src/mail/e-mail-request.c:276
+#: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
@@ -18159,7 +18495,7 @@ msgstr "Merkitse edelleenlähetettäväksi"
 
 #: ../src/mail/e-mail-tag-editor.c:161
 msgid "Cl_ear"
-msgstr ""
+msgstr "_Tyhjennä"
 
 #: ../src/mail/e-mail-templates-store.c:115
 msgid "No Title"
@@ -18205,14 +18541,16 @@ msgstr[1] ""
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
 #: ../src/mail/em-composer-utils.c:829
-msgid "Waiting for attachments to load..."
+#, fuzzy
+#| msgid "Waiting for attachments to load..."
+msgid "Waiting for attachments to load…"
 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.
-#: ../src/mail/em-composer-utils.c:2176
+#: ../src/mail/em-composer-utils.c:2027
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18220,93 +18558,84 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../src/mail/em-composer-utils.c:2182
+#: ../src/mail/em-composer-utils.c:2033
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../src/mail/em-composer-utils.c:2187
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2919
+#: ../src/mail/em-composer-utils.c:2799
 #, fuzzy, c-format
 #| msgid "URL: %s"
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "URL: %s"
 
-#: ../src/mail/em-composer-utils.c:3529
+#: ../src/mail/em-composer-utils.c:3417
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../src/mail/em-composer-utils.c:4173
+#: ../src/mail/em-composer-utils.c:4045
 msgid "Alternative Reply"
 msgstr ""
 
-#: ../src/mail/em-composer-utils.c:4176
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../src/mail/em-composer-utils.c:4048
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/mail/em-composer-utils.c:4189
-#, fuzzy
-#| msgid "Recipients"
+#: ../src/mail/em-composer-utils.c:4061
 msgid "Recipients:"
-msgstr "Vastaanottajat"
+msgstr "Vastaanottajat:"
 
-#: ../src/mail/em-composer-utils.c:4217
-#, fuzzy
-#| msgid "_Reply to Sender"
+#: ../src/mail/em-composer-utils.c:4089
 msgid "Reply to _Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../src/mail/em-composer-utils.c:4239
-#, fuzzy
-#| msgid "_Reply style:"
+#: ../src/mail/em-composer-utils.c:4111
 msgid "Reply style:"
-msgstr "_Vastaustyyli:"
+msgstr "Vastaustyyli:"
 
-#: ../src/mail/em-composer-utils.c:4247
+#: ../src/mail/em-composer-utils.c:4119
 msgid "_Default"
 msgstr "Oletu_s"
 
-#: ../src/mail/em-composer-utils.c:4251
+#: ../src/mail/em-composer-utils.c:4123
 msgid "Attach_ment"
 msgstr "Liit_e"
 
-#: ../src/mail/em-composer-utils.c:4255
-#, fuzzy
-#| msgctxt "ReplyForward"
-#| msgid "Inline (Outlook style)"
+#: ../src/mail/em-composer-utils.c:4127
 msgid "Inline (_Outlook style)"
-msgstr "Sisennetty (Outlookin tapaan)"
+msgstr "Sisennetty (_Outlookin tapaan)"
 
-#: ../src/mail/em-composer-utils.c:4259
+#: ../src/mail/em-composer-utils.c:4131
 msgid "_Quote"
 msgstr "_Lainaa"
 
-#: ../src/mail/em-composer-utils.c:4263
+#: ../src/mail/em-composer-utils.c:4135
 msgid "Do _Not Quote"
 msgstr "_Älä lainaa"
 
-#: ../src/mail/em-composer-utils.c:4270
+#: ../src/mail/em-composer-utils.c:4142
 msgid "_Format message in HTML"
 msgstr "Muotoile viesti _HTML:nä"
 
-#: ../src/mail/em-composer-utils.c:4280
+#: ../src/mail/em-composer-utils.c:4152
 #, fuzzy
 #| msgid "_Template:"
 msgid "Apply t_emplate"
 msgstr "_Malli:"
 
-#: ../src/mail/em-composer-utils.c:4292
+#: ../src/mail/em-composer-utils.c:4164
 #, fuzzy
 #| msgid "Original message"
 msgid "Preserve original message S_ubject"
 msgstr "Alkuperäinen viesti"
 
-#: ../src/mail/em-composer-utils.c:4358
+#: ../src/mail/em-composer-utils.c:4230
 #, fuzzy, c-format
 #| msgid "Sender or Recipients"
 msgid "one recipient"
@@ -18315,19 +18644,17 @@ msgstr[0] "Lähettäjä tai vastaanottajat"
 msgstr[1] "Lähettäjä tai vastaanottajat"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4776
+#: ../src/mail/em-composer-utils.c:4639
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../src/mail/em-composer-utils.c:4781
+#: ../src/mail/em-composer-utils.c:4644
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
 #: ../src/mail/em-filter-editor.c:43
-#, fuzzy
-#| msgid "Description List"
 msgid "Description of Filters"
-msgstr "Kuvauslista"
+msgstr "Suodattimien kuvaus"
 
 #. Translators: The first '%s' is replaced with the rule name;
 #. the second '%s' with 'enabled' or 'disabled' word;
@@ -18338,16 +18665,12 @@ msgid "%s (%s, for account %s)"
 msgstr ""
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#, fuzzy
-#| msgid "Enabled"
 msgid "enabled"
 msgstr "käytössä"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#, fuzzy
-#| msgid "_Disable"
 msgid "disabled"
-msgstr "Älä _käytä"
+msgstr "ei käytössä"
 
 #. Translators: The first '%s' is replaced with the rule name;
 #. the second '%s' with 'enabled' or 'disabled' word
@@ -18374,10 +18697,8 @@ msgid "Then"
 msgstr "sitten"
 
 #: ../src/mail/em-filter-editor.c:408
-#, fuzzy
-#| msgid "Message Filters"
 msgid "De_scribe Filters…"
-msgstr "Viestisuodattimet"
+msgstr "_Kuvaile suodattimet…"
 
 #: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
@@ -18403,40 +18724,58 @@ msgstr "_Tili:"
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
-#: ../src/mail/em-folder-properties.c:241
+#: ../src/mail/em-folder-properties.c:170
+#, fuzzy
+#| msgid "Select destination"
+msgid "Select Custom Icon"
+msgstr "Valitse kohde"
+
+#: ../src/mail/em-folder-properties.c:219
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "_Use custom icon"
+msgstr "Käytä omia fontteja"
+
+#: ../src/mail/em-folder-properties.c:312
+#, fuzzy
+#| msgid "Unset Color"
+msgid "Use te_xt color"
+msgstr "Poista värin asetus"
+
+#: ../src/mail/em-folder-properties.c:494
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
-#: ../src/mail/em-folder-properties.c:252
+#: ../src/mail/em-folder-properties.c:505
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../src/mail/em-folder-properties.c:273
+#: ../src/mail/em-folder-properties.c:526
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../src/mail/em-folder-properties.c:275
+#: ../src/mail/em-folder-properties.c:528
 #, 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
-#: ../src/mail/em-folder-properties.c:419
+#: ../src/mail/em-folder-properties.c:672
 msgid "_Send Account Override:"
 msgstr "_Lähetystilin ohitus:"
 
-#: ../src/mail/em-folder-properties.c:626
+#: ../src/mail/em-folder-properties.c:912
 msgid "Archive this folder using these settings:"
 msgstr "Arkistoi tämä kansio käyttäen seuraavia asetuksia:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:638
+#: ../src/mail/em-folder-properties.c:924
 #, fuzzy
 #| msgctxt "autoarchive"
 #| msgid "_Cleanup messages older than"
@@ -18445,79 +18784,83 @@ msgid "Auto-_cleanup messages older than"
 msgstr "_Siivoa vanhemmat viestit kuin"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:651
+#: ../src/mail/em-folder-properties.c:937
 msgctxt "autoarchive"
 msgid "days"
 msgstr "päivää"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:653
+#: ../src/mail/em-folder-properties.c:939
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "viikkoa"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:655
+#: ../src/mail/em-folder-properties.c:941
 msgctxt "autoarchive"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../src/mail/em-folder-properties.c:661
+#: ../src/mail/em-folder-properties.c:947
 #, fuzzy
 #| msgid "Move old messages to the default archive _folder"
 msgid "Move messages to the default archive _folder"
 msgstr "Siirrä valitut viestit _oletusarkistokansioon"
 
-#: ../src/mail/em-folder-properties.c:668
+#: ../src/mail/em-folder-properties.c:954
 #, fuzzy
 #| msgid "_Move old messages to:"
 msgid "_Move messages to:"
 msgstr "Siirrä va_nhat viestit kansioon:"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 #, fuzzy
 #| msgid "AutoArchive folder"
 msgid "Archive folder"
 msgstr "Automaattisen arkistoinnin kansio"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for Archive"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../src/mail/em-folder-properties.c:676
+#: ../src/mail/em-folder-properties.c:962
 msgid "_Delete messages"
 msgstr "Poista _viestit"
 
-#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-folder-properties.c:1317
 #, fuzzy
 #| msgid "Server Type:"
 msgid "Server Tag"
 msgstr "Palvelintyyppi:"
 
-#: ../src/mail/em-folder-properties.c:1035 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Merkintä"
 
+#: ../src/mail/em-folder-properties.c:1370
+msgid "Appearance"
+msgstr "Ulkoasu"
+
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1087
+#: ../src/mail/em-folder-properties.c:1374
 #, fuzzy
 #| msgid "_Archive..."
 msgid "Archive"
 msgstr "_Arkistoi..."
 
-#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../src/mail/em-folder-properties.c:1169
+#: ../src/mail/em-folder-properties.c:1455
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../src/mail/em-folder-properties.c:1408
+#: ../src/mail/em-folder-properties.c:1694
 msgid "Gathering folder properties"
 msgstr "Kerätään kansion ominaisuuksia"
 
@@ -18529,7 +18872,7 @@ msgstr "<Valitse kansio tästä>"
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
-#: ../src/mail/em-folder-tree.c:682
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 
@@ -18551,50 +18894,46 @@ msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:876
+#: ../src/mail/em-folder-tree.c:879
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1731
+#: ../src/mail/em-folder-tree.c:1741
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../src/mail/em-folder-tree.c:2280
+#: ../src/mail/em-folder-tree.c:2290
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2283
+#: ../src/mail/em-folder-tree.c:2293
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2313
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445 ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:460 ../src/mail/em-folder-tree-model.c:462
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../src/mail/em-folder-tree-model.c:1326 ../src/mail/em-folder-tree-model.c:1703
-msgid "Loading..."
-msgstr "Ladataan..."
-
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -18635,9 +18974,9 @@ msgstr "_Tilaa näytetyt"
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1888
+#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1890
 #: ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
@@ -18650,7 +18989,7 @@ msgstr "Peru kansioiden tilauksia"
 msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1313
+#: ../src/mail/em-subscription-editor.c:1315
 #: ../src/modules/mail/e-mail-shell-view-private.c:933
 #: ../src/modules/mail/e-mail-shell-view-private.c:965
 #: ../src/modules/mail/e-mail-shell-view-private.c:1009
@@ -18660,7 +18999,7 @@ msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../src/mail/em-subscription-editor.c:1317
+#: ../src/mail/em-subscription-editor.c:1319
 #: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
@@ -18668,60 +19007,60 @@ msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../src/mail/em-subscription-editor.c:1729
+#: ../src/mail/em-subscription-editor.c:1731
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1764
+#: ../src/mail/em-subscription-editor.c:1766
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../src/mail/em-subscription-editor.c:1777
+#: ../src/mail/em-subscription-editor.c:1779
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../src/mail/em-subscription-editor.c:1794
+#: ../src/mail/em-subscription-editor.c:1796
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../src/mail/em-subscription-editor.c:1841
+#: ../src/mail/em-subscription-editor.c:1843
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../src/mail/em-subscription-editor.c:1842
+#: ../src/mail/em-subscription-editor.c:1844
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
+#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1927
+#: ../src/mail/em-subscription-editor.c:1929
 msgid "Collapse all folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1930
 msgid "C_ollapse All"
 msgstr "Pienennä kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1938
+#: ../src/mail/em-subscription-editor.c:1940
 msgid "Expand all folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1939
+#: ../src/mail/em-subscription-editor.c:1941
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1949
+#: ../src/mail/em-subscription-editor.c:1951
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../src/mail/em-subscription-editor.c:1961
+#: ../src/mail/em-subscription-editor.c:1963
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
-#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/mail/em-subscription-editor.c:1964
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Pysäytä"
@@ -19164,7 +19503,7 @@ msgstr "Evolution KMail-tuoja"
 msgid "Import mail and contacts from KMail."
 msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
-#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/mail/importers/kmail-libs.c:149
 #: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Trash"
 msgstr "Roskakori"
@@ -19178,15 +19517,15 @@ msgid "Importing mail and contacts from KMail"
 msgstr "Tuodaan sähköpostit ja yhteystiedot KMailista."
 
 #. Destination folder, was set in our widget
-#: ../src/mail/importers/mail-importer.c:187
-#: ../src/mail/importers/mail-importer.c:312
+#: ../src/mail/importers/mail-importer.c:190
+#: ../src/mail/importers/mail-importer.c:315
 #: ../src/plugins/dbx-import/dbx-importer.c:612
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
 msgid "Importing “%s”"
 msgstr "Tuodaan “%s”"
 
-#: ../src/mail/importers/mail-importer.c:556
+#: ../src/mail/importers/mail-importer.c:559
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
@@ -19257,10 +19596,8 @@ msgstr[1] ""
 "”%s”."
 
 #: ../src/mail/mail-autofilter.c:560
-#, fuzzy
-#| msgid "Message Filters"
 msgid "Open Message Filters"
-msgstr "Viestisuodattimet"
+msgstr "Avaa viestisuodattimet"
 
 #: ../src/mail/mail-config.ui.h:1
 #, fuzzy
@@ -20008,7 +20345,7 @@ msgid ""
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -20324,7 +20661,7 @@ msgstr "_Lisää"
 
 #: ../src/mail/mail.error.xml.h:119
 msgid "Evolution’s local mail format has changed."
-msgstr ""
+msgstr "Evolutionin paikallisen postin muoto on muuttunut."
 
 #: ../src/mail/mail.error.xml.h:120
 msgid ""
@@ -20777,8 +21114,8 @@ msgid "Failed to empty Junk folder “{0}”"
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
 #: ../src/mail/mail-send-recv.c:193
-msgid "Canceling..."
-msgstr "Perutaan..."
+msgid "Canceling…"
+msgstr "Perutaan…"
 
 #: ../src/mail/mail-send-recv.c:610
 msgid "Edit Message"
@@ -20799,12 +21136,12 @@ msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
-msgid "Updating..."
-msgstr "Päivitetään..."
+msgid "Updating…"
+msgstr "Päivitetään…"
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
-msgid "Waiting..."
-msgstr "Odotetaan..."
+msgid "Waiting…"
+msgstr "Odotetaan…"
 
 #: ../src/mail/mail-send-recv.c:1436
 #, fuzzy, c-format
@@ -20841,97 +21178,103 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:309
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:310
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:311
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:312
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:313
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:314
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:327
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:328
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:332
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:333
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:482
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:269
+#: ../src/mail/message-list.c:2151 ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../src/mail/message-list.c:2163
+#: ../src/mail/message-list.c:2160
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../src/mail/message-list.c:2175
+#: ../src/mail/message-list.c:2172
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../src/mail/message-list.c:2183
+#: ../src/mail/message-list.c:2180
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../src/mail/message-list.c:2185
+#: ../src/mail/message-list.c:2182
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3265
+#: ../src/mail/message-list.c:3267
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../src/mail/message-list.c:4010 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4022 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Viestit"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5559
+#: ../src/mail/message-list.c:5591
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/message-list.c:6629
+#: ../src/mail/message-list.c:6654
 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 running a new search "
 "either by clearing it with Search→Clear menu item or by changing the query above."
 msgstr ""
 
-#: ../src/mail/message-list.c:6637
+#: ../src/mail/message-list.c:6662
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
+#: ../src/mail/message-list.c:6738
+#, fuzzy
+#| msgid "Generating message list"
+msgid "Generating message list…"
+msgstr "Luodaan viestiluetteloa"
+
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Merkitty"
@@ -20964,7 +21307,7 @@ msgstr "Viestit"
 msgid "Subject — Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../src/mail/message-list.etspec.h:21 ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/mail/message-list.etspec.h:21 ../src/plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
@@ -20989,32 +21332,32 @@ msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -21046,7 +21389,7 @@ msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:326
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:271
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
@@ -21180,8 +21523,8 @@ msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
-msgid "Co_py All Contacts To..."
-msgstr "Ko_pioi kaikki yhteystiedot..."
+msgid "Co_py All Contacts To…"
+msgstr "Ko_pioi kaikki yhteystiedot…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Copy the contacts of the selected address book to another"
@@ -21196,17 +21539,19 @@ msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
-msgid "_Manage Address Book groups..."
+#, fuzzy
+#| msgid "_Manage Address Book groups..."
+msgid "_Manage Address Book groups…"
 msgstr "_Hallitse osoitekirjan ryhmiä..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
-#: ../src/modules/calendar/e-task-shell-view-actions.c:735
+#: ../src/modules/calendar/e-task-shell-view-actions.c:733
 msgid "Manage task list groups order and visibility"
 msgstr ""
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
-msgid "Mo_ve All Contacts To..."
-msgstr "Sii_rrä kaikki yhteystiedot..."
+msgid "Mo_ve All Contacts To…"
+msgstr "Sii_rrä kaikki yhteystiedot…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move the contacts of the selected address book to another"
@@ -21225,9 +21570,9 @@ msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
-#: ../src/modules/calendar/e-task-shell-view-actions.c:754
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
@@ -21251,12 +21596,12 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
-#: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
-msgid "_Rename..."
-msgstr "_Nimeä uudestaan..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+msgid "_Rename…"
+msgstr "_Nimeä uudelleen…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
 msgid "Rename the selected address book"
@@ -21267,8 +21612,8 @@ msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
-msgid "_Copy Contact To..."
-msgstr "_Kopioi yhteystieto..."
+msgid "_Copy Contact To…"
+msgstr "_Kopioi yhteystieto…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
 msgid "Copy selected contacts to another address book"
@@ -21279,36 +21624,36 @@ msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
-msgid "_Find in Contact..."
-msgstr "_Etsi yhteystiedosta..."
+msgid "_Find in Contact…"
+msgstr "_Etsi yhteystiedosta…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1108
 msgid "Search for text in the displayed contact"
 msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1113
-msgid "_Forward Contact..."
-msgstr "_Välitä yhteystieto..."
+msgid "_Forward Contact…"
+msgstr "_Välitä yhteystieto…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Send selected contacts to another person"
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1120
-msgid "_Move Contact To..."
-msgstr "_Siirry yhteystieto..."
+msgid "_Move Contact To…"
+msgstr "_Siirry yhteystieto…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1122
 msgid "Move selected contacts to another address book"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1127
-msgid "_New Contact..."
-msgstr "_Uusi yhteystieto..."
+msgid "_New Contact…"
+msgstr "_Uusi yhteystieto…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
-msgid "New Contact _List..."
-msgstr "Uusi yhteystieto_luettelo..."
+msgid "New Contact _List…"
+msgstr "Uu_si yhteystietoluettelo…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "_Open Contact"
@@ -21319,32 +21664,32 @@ msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
-msgid "_Send Message to Contact..."
-msgstr "Lähetä _viesti henkilölle..."
+msgid "_Send Message to Contact…"
+msgstr "Lähetä _viesti yhteystiedolle…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Send a message to the selected contacts"
 msgstr "Lähetä viesti valituille henkilöille"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1530
-#: ../src/modules/calendar/e-task-shell-view-actions.c:833
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "T_oiminnot"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:686
-#: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "_Preview"
 msgstr "_Esikatselu"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:703
-#: ../src/modules/calendar/e-task-shell-view-actions.c:857
-msgid "_Manage groups..."
-msgstr "_Hallitse ryhmiä..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:701
+#: ../src/modules/calendar/e-task-shell-view-actions.c:855
+msgid "_Manage groups…"
+msgstr "_Hallitse ryhmiä…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
 msgid "Address Book Map"
@@ -21363,14 +21708,13 @@ msgid "Show _Maps"
 msgstr "Näytä _kartat"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
-#, fuzzy
 msgid "Show maps in contact preview window"
-msgstr "Näytä yhteystiedon esikatseluruutu"
+msgstr "Näytä kartat yhteystiedon esikatseluikkunassa"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
-#: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
@@ -21379,9 +21723,9 @@ msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
-#: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
@@ -21390,17 +21734,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:792
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1000
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:790
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:802
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:800
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Oma haku"
@@ -21428,8 +21772,8 @@ msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 #. Translators: This is an action label
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1358
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1368
-msgid "_Save as vCard..."
-msgstr "_Tallenna vCard-muodossa..."
+msgid "_Save as vCard…"
+msgstr "_Tallenna vCard-muodossa…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
 msgid "Save selected contacts as a vCard"
@@ -21455,11 +21799,11 @@ msgstr "Lähetä _viesti listalle"
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:169
-#, fuzzy, c-format
+#: ../src/modules/alarm-notify/alarm-notify.c:171
+#, c-format
 #| msgid "Failed to open calendar “{0}”"
 msgid "Failed to launch command “%s”:"
-msgstr "Kalenterin “{0}” avaus epäonnistui"
+msgstr "Ei voitu suorittaa komentoa “%s”:"
 
 #: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
@@ -21472,17 +21816,17 @@ msgstr ""
 "Palautus palauttaa kaikki henkilökohtaiset tiedot, asetukset, "
 "sähköpostisuodattimet jne."
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Palauta varmuuskopiotiedostosta:"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Valitse palautettava varmuuskopiotiedosto"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:292
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Palauta varmuuskopiosta"
@@ -21505,20 +21849,20 @@ msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
-msgid "Checking content of backup file “%s”, please wait..."
-msgstr "Tarkistetaan varmuuskopiotiedoston “%s” sisältöä, odota hetki..."
+msgid "Checking content of backup file “%s”, please wait…"
+msgstr "Tarkistetaan varmuuskopiotiedoston “%s” sisältöä, odota hetki…"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:458
-msgid "_Back up Evolution Data..."
-msgstr "_Varmuuskopioi Evolutionin tiedot..."
+msgid "_Back up Evolution Data…"
+msgstr "_Varmuuskopioi Evolutionin tiedot…"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:460
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:465
-msgid "R_estore Evolution Data..."
-msgstr "Palauta _Evolutionin tiedot..."
+msgid "R_estore Evolution Data…"
+msgstr "Palauta _Evolutionin tiedot…"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:467
 msgid "Restore Evolution data and settings from an archive file"
@@ -21711,25 +22055,26 @@ msgstr ""
 msgid "Choose an Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:250
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:263
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:294
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:274
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
 msgid "Find Address Books"
 msgstr "Etsi osoitekirjoja"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:285
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:336
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:426
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 
@@ -21818,7 +22163,7 @@ msgstr "Käytetään yksilöllistä nimeä (DN)"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "for example: uid=user,dc=example,dc=com"
-msgstr ""
+msgstr "esimerkki: uid=user,dc=example,dc=com"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Method:"
@@ -21904,42 +22249,42 @@ msgstr "Selaa kunnes raja tulee vastaan"
 msgid "Server address cannot be empty"
 msgstr "Palvelimen osoite ei voi olla tyhjä"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:112
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:116
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "Valitse muistilappulista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:120
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:326
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
 msgid "Find Calendars"
 msgstr "Etsi kalentereja"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:329
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:332
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
@@ -22017,144 +22362,146 @@ msgstr "Yksiköt:"
 msgid "Location cannot be empty"
 msgstr "Sijainti ei voi olla tyhjä"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "_Tuo"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#: ../src/modules/calendar/e-cal-attachment-handler.c:333
 #, fuzzy
 #| msgid "Importing Pine data"
 msgid "Importing an event"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#: ../src/modules/calendar/e-cal-attachment-handler.c:337
 #, fuzzy
 #| msgid "Importing mailbox"
 msgid "Importing a memo"
 msgstr "Tuodaan kansiota"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#: ../src/modules/calendar/e-cal-attachment-handler.c:341
 #, fuzzy
 #| msgid "Importing Elm data"
 msgid "Importing a task"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:401
+#: ../src/modules/calendar/e-cal-attachment-handler.c:399
 msgid "Select a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#: ../src/modules/calendar/e-cal-attachment-handler.c:406
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "Select a Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:415
+#: ../src/modules/calendar/e-cal-attachment-handler.c:413
 msgid "Select a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:422
+#: ../src/modules/calendar/e-cal-attachment-handler.c:420
 msgid "I_mport to Calendar"
 msgstr "Tuo _kalenteriin"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#: ../src/modules/calendar/e-cal-attachment-handler.c:427
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Memo List"
 msgstr "_Tuo tehtäviin"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#: ../src/modules/calendar/e-cal-attachment-handler.c:434
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Task List"
 msgstr "_Tuo tehtäviin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
 #, fuzzy, c-format
 #| msgid "Copying an event into the calendar %s"
 msgid "Copying an event into the calendar “%s”"
 msgstr "Kopioidaan tapahtumaa kalenteriin %s"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Moving an event into the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:581
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Copying a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:582
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Moving a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:710
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:524
+#: ../src/modules/calendar/e-calendar-preferences.c:521
 #, fuzzy
 #| msgid "Select the calendars for reminder notification"
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:531
-msgid "Selected Memo Lists for Notifications of Reminders"
-msgstr ""
-
-#: ../src/modules/calendar/e-calendar-preferences.c:538
+#: ../src/modules/calendar/e-calendar-preferences.c:528
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:634
+#: ../src/modules/calendar/e-calendar-preferences.c:612
 msgid "Meeting Invitations"
 msgstr "Kokouskutsut"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:638
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:674
-#: ../src/modules/calendar/e-calendar-preferences.c:705
+#: ../src/modules/calendar/e-calendar-preferences.c:645
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "_Preserve existing reminder by default"
+msgstr "_Säilytä oma muistutus"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:689
+#: ../src/modules/calendar/e-calendar-preferences.c:674
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1129
+#: ../src/modules/calendar/e-calendar-preferences.c:1113
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1130
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -22219,7 +22566,7 @@ msgid "_24 hour"
 msgstr "_24 tuntia"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Työviikko"
 
@@ -22390,7 +22737,9 @@ msgid "Show Tasks without _Due date"
 msgstr ""
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:73
-msgid "Display reminders in _notification area only"
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Display Reminders window with _notifications"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:74
@@ -22433,64 +22782,64 @@ msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 msgid "Select the sources for reminder notification:"
 msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Default Free/Busy Server"
 msgstr "Oletus-vapaa/varattu-palvelin"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 msgid ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 msgid "Publishing Information"
 msgstr "Julkaisutiedot"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:117
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:124
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:131
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:141
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:258
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
@@ -22512,7 +22861,7 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:940
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -22520,371 +22869,371 @@ msgstr "Muuta tämä kerta _siirrettäväksi"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1142
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:512
-#: ../src/modules/calendar/e-task-shell-view-actions.c:631
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
-msgid "_Copy..."
-msgstr "_Kopioi..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+msgid "_Copy…"
+msgstr "_Kopioi…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "_Manage Calendar groups..."
-msgstr "_Hallitse kalenteriryhmiä..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+msgid "_Manage Calendar groups…"
+msgstr "_Hallitse kalenteriryhmiä…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Manage Calendar groups order and visibility"
 msgstr "Hallitse kalenteriryhmien järjestystä ja näkyvyyttä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
-#: ../src/modules/calendar/e-task-shell-view-actions.c:824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 #, fuzzy
 #| msgid "Refresh the selected calendar"
 msgid "Re_fresh list of account calendars"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi hakuehdon seuraava esiintymä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi hakuehdon edellinen esiintymä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Sho_w All Calendars"
 msgstr "Näytä _kaikki kalenterit"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "Cop_y to Calendar..."
-msgstr "_Kopioi kalenteriin..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+msgid "Cop_y to Calendar…"
+msgstr "_Kopioi kalenteriin…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
-msgid "_Delegate Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#, fuzzy
+#| msgid "_Delegate Meeting..."
+msgid "_Delegate Meeting…"
 msgstr "_Delegoi kokous..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
-msgid "Edit as Ne_w..."
-msgstr "_Muokkaa uutena..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+msgid "Edit as Ne_w…"
+msgstr "_Muokkaa uutena…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
-#, fuzzy
-#| msgid "View the current appointment"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Edit the current appointment as new"
-msgstr "Näytä valittu tapaaminen"
+msgstr "Muokkaa valittua tapaamista uutena"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
-msgid "New All Day _Event..."
-msgstr "Uusi koko pä_ivän tapahtuma..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+msgid "New All Day _Event…"
+msgstr "Uusi koko _päivän tapahtuma…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
-msgid "_Forward as iCalendar..."
-msgstr "_Välitä iCalendar-muodossa..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+msgid "_Forward as iCalendar…"
+msgstr "_Välitä iCalendar-muodossa…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
-msgid "Mo_ve to Calendar..."
-msgstr "_Siirrä kalenteriin..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+msgid "Mo_ve to Calendar…"
+msgstr "_Siirrä kalenteriin…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
-msgid "_Schedule Meeting..."
-msgstr "_Järjestä kokous..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+msgid "_Schedule Meeting…"
+msgstr "_Järjestä kokous…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1514
-msgid "Conv_ert to Appointment..."
-msgstr "_Muunna kokoukseksi..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+msgid "Conv_ert to Appointment…"
+msgstr "_Muunna tapaamiseksi…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "Lista"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1673
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Viikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days’ Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:816
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1024
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:814
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:823
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:821
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
-msgid "Print..."
-msgstr "Tulosta..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:831
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:845
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+msgid "Print…"
+msgstr "Tulosta…"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:864
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1072
-msgid "_Save as iCalendar..."
-msgstr "_Tallenna iCalendar-muodossa..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:862
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+msgid "_Save as iCalendar…"
+msgstr "_Tallenna iCalendar-muodossa…"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Go To"
 msgstr "Siirry"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:202
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:245
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:661
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:247
 #: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:665
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:668
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:672
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
 msgid "View the selected memo"
 msgstr "Näytä valittu muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:677
-#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:815
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:849
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:885
+#: ../src/modules/calendar/e-cal-shell-view-private.c:911
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:886
+#: ../src/modules/calendar/e-cal-shell-view-private.c:912
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:907
+#: ../src/modules/calendar/e-cal-shell-view-private.c:933
 #, 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"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:911
+#: ../src/modules/calendar/e-cal-shell-view-private.c:937
 #, 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"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:934
+#: ../src/modules/calendar/e-cal-shell-view-private.c:960
 msgid "Cannot search with no active calendar"
 msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
@@ -22892,58 +23241,58 @@ msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
-#: ../src/modules/calendar/e-task-shell-view-actions.c:629
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:627
 msgid "task"
 msgstr "tehtävä"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:311
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
-#: ../src/modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../src/modules/calendar/e-task-shell-view-actions.c:791
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:332
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../src/modules/calendar/e-task-shell-view-actions.c:798
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtävät keskeneräisiksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:341
 #: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:805
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../src/modules/calendar/e-task-shell-view-actions.c:810
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../src/modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../src/modules/calendar/e-task-shell-view-actions.c:812
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1057
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
@@ -22967,7 +23316,7 @@ msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
 #: ../src/modules/calendar/e-memo-shell-backend.c:96
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
@@ -22976,83 +23325,85 @@ msgstr "Luo uusi muistilappulista"
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
-msgid "_Find in Memo..."
-msgstr "_Etsi muistilapusta..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+msgid "_Find in Memo…"
+msgstr "_Etsi muistilapusta…"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:581
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "Etsi tekstiä näytettävästä muistilapusta"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:602
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "Poista valittu muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
-msgid "_Manage Memo List groups..."
-msgstr ""
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+#| msgid "_Manage groups..."
+msgid "_Manage Memo List groups…"
+msgstr "_Hallitse ryhmiä..."
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:609
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Manage Memo List groups order and visibility"
 msgstr ""
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:630
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Refresh the selected memo list"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:635
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
 #, fuzzy
 #| msgid "Refresh the selected memo list"
 msgid "Re_fresh list of account memo lists"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:656
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
 #, fuzzy
 #| msgid "Show _Only This Memo List"
 msgid "Sho_w All Memo Lists"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:749
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:770
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:777
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:835
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:842
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
@@ -23097,7 +23448,7 @@ msgid "Tas_k List"
 msgstr "Te_htävälista"
 
 #: ../src/modules/calendar/e-task-shell-backend.c:94
-#: ../src/modules/calendar/e-task-shell-view-actions.c:742
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
@@ -23106,7 +23457,7 @@ msgstr "Luo uusi tehtävälista"
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:573
+#: ../src/modules/calendar/e-task-shell-view-actions.c:571
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -23118,123 +23469,125 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:580
+#: ../src/modules/calendar/e-task-shell-view-actions.c:578
 msgid "Do not ask me again"
 msgstr "Älä kysy uudestaan"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:698
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:705
-msgid "_Find in Task..."
-msgstr "_Etsi tehtävästä..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+msgid "_Find in Task…"
+msgstr "_Etsi tehtävästä…"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:707
+#: ../src/modules/calendar/e-task-shell-view-actions.c:705
 msgid "Search for text in the displayed task"
 msgstr "Etsi tekstiä näytettävästä tehtävästä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "D_elete Task List"
 msgstr "_Poista tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:728
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Delete the selected task list"
 msgstr "Poista valittu tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:733
-msgid "_Manage Task List groups..."
-msgstr ""
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+#, fuzzy
+#| msgid "_Manage groups..."
+msgid "_Manage Task List groups…"
+msgstr "_Hallitse ryhmiä..."
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:756
+#: ../src/modules/calendar/e-task-shell-view-actions.c:754
 msgid "Refresh the selected task list"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 #, fuzzy
 #| msgid "Refresh the selected task list"
 msgid "Re_fresh list of account task lists"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:770
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 #, fuzzy
 #| msgid "Show _Only This Task List"
 msgid "Sho_w All Task Lists"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:826
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:913
+#: ../src/modules/calendar/e-task-shell-view-actions.c:911
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:915
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:936
+#: ../src/modules/calendar/e-task-shell-view-actions.c:934
 msgid "Show task preview below the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:943
+#: ../src/modules/calendar/e-task-shell-view-actions.c:941
 msgid "Show task preview alongside the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:951
+#: ../src/modules/calendar/e-task-shell-view-actions.c:949
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:965
+#: ../src/modules/calendar/e-task-shell-view-actions.c:963
 msgid "Cancelled Tasks"
 msgstr "Perutut tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:972
+#: ../src/modules/calendar/e-task-shell-view-actions.c:970
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:979
+#: ../src/modules/calendar/e-task-shell-view-actions.c:977
 msgid "Next 7 Days’ Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:993
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:345
+#: ../src/modules/calendar/e-task-shell-view.c:346
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:347
+#: ../src/modules/calendar/e-task-shell-view.c:348
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
@@ -23245,21 +23598,21 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:331
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 msgid "Convert to M_eeting"
 msgstr "Muunna _kokoukseksi"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:333
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Convert the message to a meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:365
 msgid "Convert to M_essage"
 msgstr "Muunna _viestiksi"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:367
 #, fuzzy
 #| msgid "Compose a new mail message"
 msgid "Convert to the mail message"
@@ -23315,7 +23668,7 @@ msgstr "LDAP-palvelin"
 msgid "Looking up LDAP server…"
 msgstr "Etsitään LDAP-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:240
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
 msgid "Look up in SRV records"
 msgstr "Etsitään SRV-tietueita"
 
@@ -23347,486 +23700,498 @@ msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:263
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:273
+#: ../src/modules/itip-formatter/itip-view.c:272
 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.
-#: ../src/modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:292
+#: ../src/modules/itip-formatter/itip-view.c:291
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:297
+#: ../src/modules/itip-formatter/itip-view.c:296
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:301
+#: ../src/modules/itip-formatter/itip-view.c:300
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:320
+#: ../src/modules/itip-formatter/itip-view.c:319
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:325
+#: ../src/modules/itip-formatter/itip-view.c:324
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:329
+#: ../src/modules/itip-formatter/itip-view.c:328
 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.
-#: ../src/modules/itip-formatter/itip-view.c:334
+#: ../src/modules/itip-formatter/itip-view.c:333
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:338
+#: ../src/modules/itip-formatter/itip-view.c:337
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:347
+#: ../src/modules/itip-formatter/itip-view.c:346
 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.
-#: ../src/modules/itip-formatter/itip-view.c:353
+#: ../src/modules/itip-formatter/itip-view.c:352
 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.
-#: ../src/modules/itip-formatter/itip-view.c:357
+#: ../src/modules/itip-formatter/itip-view.c:356
 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.
-#: ../src/modules/itip-formatter/itip-view.c:362
+#: ../src/modules/itip-formatter/itip-view.c:361
 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.
-#: ../src/modules/itip-formatter/itip-view.c:366
+#: ../src/modules/itip-formatter/itip-view.c:365
 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.
-#: ../src/modules/itip-formatter/itip-view.c:372
+#: ../src/modules/itip-formatter/itip-view.c:371
 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.
-#: ../src/modules/itip-formatter/itip-view.c:377
+#: ../src/modules/itip-formatter/itip-view.c:376
 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.
-#: ../src/modules/itip-formatter/itip-view.c:381
+#: ../src/modules/itip-formatter/itip-view.c:380
 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.
-#: ../src/modules/itip-formatter/itip-view.c:386
+#: ../src/modules/itip-formatter/itip-view.c:385
 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.
-#: ../src/modules/itip-formatter/itip-view.c:390
+#: ../src/modules/itip-formatter/itip-view.c:389
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
+#: ../src/modules/itip-formatter/itip-view.c:427
 #: ../src/modules/itip-formatter/itip-view.c:428
-#: ../src/modules/itip-formatter/itip-view.c:429
+#: ../src/modules/itip-formatter/itip-view.c:517
 #: ../src/modules/itip-formatter/itip-view.c:518
-#: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:608
+#: ../src/modules/itip-formatter/itip-view.c:607
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:611
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:435
-#: ../src/modules/itip-formatter/itip-view.c:525
-#: ../src/modules/itip-formatter/itip-view.c:614
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:442
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../src/modules/itip-formatter/itip-view.c:447
+#: ../src/modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:460
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:463
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:469
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:472
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:475
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:478
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, fuzzy, c-format
 #| msgid "%s has canceled the following meeting:"
 msgid "%s has cancelled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:481
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../src/modules/itip-formatter/itip-view.c:484
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:490
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:532
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:537
+#: ../src/modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:547
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:550
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following assigned "
 "task:"
 msgstr "%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, 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ä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:559
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:562
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:565
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:568
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:571
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:574
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:618
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:621
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:625
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:628
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:631
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:634
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, 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:"
 
-#: ../src/modules/itip-formatter/itip-view.c:859
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
-#: ../src/modules/itip-formatter/itip-view.c:1683
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1678
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
-#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1214
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:1217
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1220
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../src/modules/itip-formatter/itip-view.c:1223
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1226
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1229
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1232
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../src/modules/itip-formatter/itip-view.c:1235
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../src/modules/itip-formatter/itip-view.c:1238
+#: ../src/modules/itip-formatter/itip-view.c:1237
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../src/modules/itip-formatter/itip-view.c:1241
+#: ../src/modules/itip-formatter/itip-view.c:1240
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../src/modules/itip-formatter/itip-view.c:1686
-#: ../src/modules/itip-formatter/itip-view.c:1734
-#: ../src/modules/itip-formatter/itip-view.c:1805
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1729
+#: ../src/modules/itip-formatter/itip-view.c:1800
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1722
+#: ../src/modules/itip-formatter/itip-view.c:1717
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1732
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1735
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../src/modules/itip-formatter/itip-view.c:1741
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../src/modules/itip-formatter/itip-view.c:1742
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:1743
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:2052
+#: ../src/modules/itip-formatter/itip-view.c:2074
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2055
+#: ../src/modules/itip-formatter/itip-view.c:2077
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3112
+#: ../src/modules/itip-formatter/itip-view.c:3151
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../src/modules/itip-formatter/itip-view.c:3634
-#: ../src/modules/itip-formatter/itip-view.c:5200
+#: ../src/modules/itip-formatter/itip-view.c:3715
+#: ../src/modules/itip-formatter/itip-view.c:5468
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:3849
+#: ../src/modules/itip-formatter/itip-view.c:3925
 #, c-format
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3855
+#: ../src/modules/itip-formatter/itip-view.c:3932
+#, fuzzy, c-format
+#| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
+msgid "A task “%s” in the task list “%s” conflicts with this task"
+msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
+
+#: ../src/modules/itip-formatter/itip-view.c:3939
+#, fuzzy, c-format
+#| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
+msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
+msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
+
+#: ../src/modules/itip-formatter/itip-view.c:3950
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -23837,149 +24202,265 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3888
+#: ../src/modules/itip-formatter/itip-view.c:3959
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "The task list “%s” contains a task which conflicts with this task"
+msgid_plural "The task list “%s” contains %d tasks which conflict with this task"
+msgstr[0] ""
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
+msgstr[1] ""
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
+
+#: ../src/modules/itip-formatter/itip-view.c:3968
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "The memo list “%s” contains a memo which conflicts with this memo"
+msgid_plural "The memo list “%s” contains %d memos which conflict with this memo"
+msgstr[0] ""
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
+msgstr[1] ""
+"Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
+
+#: ../src/modules/itip-formatter/itip-view.c:4006
 #, fuzzy, c-format
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Found the appointment in the calendar “%s”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/modules/itip-formatter/itip-view.c:3897
+#: ../src/modules/itip-formatter/itip-view.c:4011
+#, fuzzy, c-format
+#| msgid "Show task preview below the task list"
+msgid "Found the task in the task list “%s”"
+msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
+
+#: ../src/modules/itip-formatter/itip-view.c:4016
+#, fuzzy, c-format
+#| msgid "Delete memo list '{0}'?"
+msgid "Found the memo in the memo list “%s”"
+msgstr "Poistetaanko muistilappulista \"{0}\"?"
+
+#: ../src/modules/itip-formatter/itip-view.c:4027
 #, fuzzy
 #| msgid "The meeting is invalid and cannot be updated"
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../src/modules/itip-formatter/itip-view.c:4039
+#: ../src/modules/itip-formatter/itip-view.c:4169
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:4047
+#: ../src/modules/itip-formatter/itip-view.c:4177
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../src/modules/itip-formatter/itip-view.c:4052
+#: ../src/modules/itip-formatter/itip-view.c:4182
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4057
+#: ../src/modules/itip-formatter/itip-view.c:4187
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4398
-msgid "Opening the calendar. Please wait..."
-msgstr "Avataan kalenteria, odota hetki..."
-
-#: ../src/modules/itip-formatter/itip-view.c:4403
+#: ../src/modules/itip-formatter/itip-view.c:4481
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4811
+#: ../src/modules/itip-formatter/itip-view.c:4485
+#, fuzzy
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this task"
+msgstr "Etsitään olemassa olevia versioita tapaamisesta"
+
+#: ../src/modules/itip-formatter/itip-view.c:4489
+#, fuzzy
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this memo"
+msgstr "Etsitään olemassa olevia versioita tapaamisesta"
+
+#: ../src/modules/itip-formatter/itip-view.c:4547
+msgid "Opening the calendar. Please wait…"
+msgstr "Avataan kalenteria, odota hetki…"
+
+#: ../src/modules/itip-formatter/itip-view.c:4964
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar '%s'.  %s"
+msgid "Unable to send item to calendar “%s”. %s"
+msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4972
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar '%s'.  %s"
+msgid "Unable to send item to task list “%s”. %s"
+msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4980
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
-msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to memo list “%s”. %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4826
+#: ../src/modules/itip-formatter/itip-view.c:5000
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4831
+#: ../src/modules/itip-formatter/itip-view.c:5005
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as accepted"
+msgid "Sent to task list “%s” as accepted"
+msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
+
+#: ../src/modules/itip-formatter/itip-view.c:5010
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as accepted"
+msgid "Sent to memo list “%s” as accepted"
+msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
+
+#: ../src/modules/itip-formatter/itip-view.c:5020
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:4837
+#: ../src/modules/itip-formatter/itip-view.c:5025
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as tentative"
+msgid "Sent to task list “%s” as tentative"
+msgstr "Lähetetty kalenteriin “%s”alustavana"
+
+#: ../src/modules/itip-formatter/itip-view.c:5030
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as tentative"
+msgid "Sent to memo list “%s” as tentative"
+msgstr "Lähetetty kalenteriin “%s”alustavana"
+
+#: ../src/modules/itip-formatter/itip-view.c:5040
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4843
+#: ../src/modules/itip-formatter/itip-view.c:5045
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as declined"
+msgid "Sent to task list “%s” as declined"
+msgstr "Lähetetty kalenteriin “%s” hylättynä"
+
+#: ../src/modules/itip-formatter/itip-view.c:5050
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as declined"
+msgid "Sent to memo list “%s” as declined"
+msgstr "Lähetetty kalenteriin “%s” hylättynä"
+
+#: ../src/modules/itip-formatter/itip-view.c:5060
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4878
-#: ../src/modules/itip-formatter/itip-view.c:5337
-#: ../src/modules/itip-formatter/itip-view.c:5440
-msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:5065
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as cancelled"
+msgid "Sent to task list “%s” as cancelled"
+msgstr "Lähetetty kalenteriin “%s” peruttuna"
+
+#: ../src/modules/itip-formatter/itip-view.c:5070
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as cancelled"
+msgid "Sent to memo list “%s” as cancelled"
+msgstr "Lähetetty kalenteriin “%s” peruttuna"
+
+#: ../src/modules/itip-formatter/itip-view.c:5088
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the calendar. Please wait…"
+msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
+
+#: ../src/modules/itip-formatter/itip-view.c:5091
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the task list. Please wait…"
+msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
+
+#: ../src/modules/itip-formatter/itip-view.c:5094
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the memo list. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4932
+#: ../src/modules/itip-formatter/itip-view.c:5185
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5124
+#: ../src/modules/itip-formatter/itip-view.c:5393
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5141
+#: ../src/modules/itip-formatter/itip-view.c:5410
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5145
+#: ../src/modules/itip-formatter/itip-view.c:5414
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5192
+#: ../src/modules/itip-formatter/itip-view.c:5460
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5227
+#: ../src/modules/itip-formatter/itip-view.c:5493
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../src/modules/itip-formatter/itip-view.c:5302
+#: ../src/modules/itip-formatter/itip-view.c:5578
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5373
-#: ../src/modules/itip-formatter/itip-view.c:5411
+#: ../src/modules/itip-formatter/itip-view.c:5653
+#: ../src/modules/itip-formatter/itip-view.c:5691
 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"
 
-#: ../src/modules/itip-formatter/itip-view.c:5472
+#: ../src/modules/itip-formatter/itip-view.c:5752
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5477
+#: ../src/modules/itip-formatter/itip-view.c:5757
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5482
+#: ../src/modules/itip-formatter/itip-view.c:5762
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5493
+#: ../src/modules/itip-formatter/itip-view.c:5773
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:5498
+#: ../src/modules/itip-formatter/itip-view.c:5778
 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"
 
-#: ../src/modules/itip-formatter/itip-view.c:5503
+#: ../src/modules/itip-formatter/itip-view.c:5783
 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.
-#: ../src/modules/itip-formatter/itip-view.c:5568
+#: ../src/modules/itip-formatter/itip-view.c:5828
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5573
+#: ../src/modules/itip-formatter/itip-view.c:5833
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:5622
-#: ../src/modules/itip-formatter/itip-view.c:5635
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5894
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5623
-#: ../src/modules/itip-formatter/itip-view.c:5636
+#: ../src/modules/itip-formatter/itip-view.c:5882
+#: ../src/modules/itip-formatter/itip-view.c:5895
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23987,15 +24468,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../src/modules/itip-formatter/itip-view.c:5698
-#: ../src/modules/itip-formatter/itip-view.c:5779
-#: ../src/modules/itip-formatter/itip-view.c:5875
+#: ../src/modules/itip-formatter/itip-view.c:5977
+#: ../src/modules/itip-formatter/itip-view.c:6061
+#: ../src/modules/itip-formatter/itip-view.c:6165
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5699
-#: ../src/modules/itip-formatter/itip-view.c:5780
-#: ../src/modules/itip-formatter/itip-view.c:5876
+#: ../src/modules/itip-formatter/itip-view.c:5978
+#: ../src/modules/itip-formatter/itip-view.c:6062
+#: ../src/modules/itip-formatter/itip-view.c:6166
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
@@ -24003,23 +24484,23 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä tai "
 "vapaa/varattu-tietoja."
 
-#: ../src/modules/itip-formatter/itip-view.c:5789
+#: ../src/modules/itip-formatter/itip-view.c:6071
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5790
+#: ../src/modules/itip-formatter/itip-view.c:6072
 msgid ""
 "To process all of these items, the file should be saved and the calendar imported"
 msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../src/modules/itip-formatter/itip-view.c:6357
+#: ../src/modules/itip-formatter/itip-view.c:6659
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/itip-formatter/itip-view.c:6373
+#: ../src/modules/itip-formatter/itip-view.c:6677
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -24289,445 +24770,463 @@ msgstr "Luo uusi sähköpostikansio"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:751
+#: ../src/modules/mail/e-mail-shell-backend.c:782
 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.
-#: ../src/modules/mail/e-mail-shell-backend.c:754
+#: ../src/modules/mail/e-mail-shell-backend.c:785
 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.
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:788
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:787
+#: ../src/modules/mail/e-mail-shell-backend.c:818
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
+#. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
+#: ../src/modules/mail/e-mail-shell-backend.c:829
+#, c-format
+#| msgid "Defaults"
+msgctxt "NetworkMonitor"
+msgid "Default (%s)"
+msgstr "Oletus (%s)"
+
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:796
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:810
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:879
+#: ../src/modules/mail/e-mail-shell-backend.c:919
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:888
+#: ../src/modules/mail/e-mail-shell-backend.c:928
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:897
+#: ../src/modules/mail/e-mail-shell-backend.c:937
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1258
+#: ../src/modules/mail/e-mail-shell-backend.c:1298
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:821
-msgid "Marking messages as read..."
-msgstr "Merkitään viestejä luetuiksi..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:853
+msgid "Marking messages as read…"
+msgstr "Merkitään viestejä luetuiksi…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Go to Folder"
 msgstr "Siirry kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
 #, fuzzy
 #| msgid "_Junk"
 msgid "Empty _Junk"
 msgstr "_Roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 #, fuzzy
 #| msgid "Permanently remove all the deleted messages from all folders"
 msgid "Delete all Junk messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Refresh list of folders of this account"
 msgstr "Päivitä tämän tilin kansioiden luettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
-msgid "_Copy Folder To..."
-msgstr "_Kopioi kansio..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+msgid "_Copy Folder To…"
+msgstr "Kopioi kansio kohteeseen…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+msgid "Edit Sort _Order…"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#, fuzzy
+#| msgid "Moving folder %s"
+msgid "Change sort order of the folders in the folder tree"
+msgstr "Siirretään kansiota %s"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1610
-msgid "_Move Folder To..."
-msgstr "_Siirrä kansio..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+msgid "_Move Folder To…"
+msgstr "Siirrä kansio kohteeseen…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
-msgid "_New..."
-msgstr "_Uusi..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+msgid "_New…"
+msgstr "_Uusi…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 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"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 #, 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"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
-msgid "_Subscriptions..."
-msgstr "_Tilaukset..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+msgid "_Subscriptions…"
+msgstr "_Tilaukset…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
-msgid "C_reate Search Folder From Search..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#, fuzzy
+#| msgid "C_reate Search Folder From Search..."
+msgid "C_reate Search Folder From Search…"
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
-msgid "_New Folder..."
-msgstr "_Uusi kansio..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+msgid "_New Folder…"
+msgstr "_Uusi kansio…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 #, 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"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Show _Junk Messages"
 msgstr "Näytä _roskapostiviestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 #, 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"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Show To _Do Bar"
 msgstr "Näytä tehtä_väpalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 #, fuzzy
 #| msgid "Last 5 Days' Messages"
 msgid "Last 5 Days’ Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Message Thread"
 msgstr "Viestinketju"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
-#, fuzzy
-#| msgid "In Current Folder and _Subfolders"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 msgid "Current Folder and Subfolders"
-msgstr "Nykyisessä kansiossa ja alikan_sioissa"
+msgstr "Nykyinen kansio ja alakansiot"
 
-#: ../src/modules/mail/e-mail-shell-view.c:893
+#: ../src/modules/mail/e-mail-shell-view.c:895
 #, fuzzy
 #| msgid "In Current Folder and _Subfolders"
 msgid "Current Folder and Subfolders Search"
 msgstr "Nykyisessä kansiossa ja alikan_sioissa"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1013
+#: ../src/modules/mail/e-mail-shell-view.c:1017
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1121
+#: ../src/modules/mail/e-mail-shell-view.c:1127
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
@@ -25128,22 +25627,22 @@ msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
 msgstr "Vaihtoehtoisesti voit sen sijaan %s (sähköposti, yhteystiedot ja kalenteri)."
 
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
-msgid "Loading accounts..."
-msgstr "Ladataan tilejä..."
+msgid "Loading accounts…"
+msgstr "Ladataan tilejä…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-msgid "_Format as..."
-msgstr "_Muotoile..."
+msgid "_Format as…"
+msgstr "_Muotoile…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:498
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:493
 msgid "Text Highlight"
 msgstr "Tekstin korostus"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:499
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:494
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
@@ -25554,11 +26053,11 @@ msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:861
+#: ../src/plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:878
+#: ../src/plugins/email-custom-header/email-custom-header.c:879
 #: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Arvot"
@@ -25893,8 +26392,8 @@ msgstr "Aihe: %s"
 #, c-format
 msgid "(and %d more)"
 msgid_plural "(and %d more)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(ja %d lisää)"
+msgstr[1] "(ja %d lisää)"
 
 #: ../src/plugins/mail-notification/mail-notification.c:513
 msgid "New email in Evolution"
@@ -25955,30 +26454,30 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Huomauttaa uusien viestien saapumisesta."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:200
+#: ../src/plugins/mail-to-task/mail-to-task.c:198
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:605
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Peru"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:607
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:609
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:627
+#: ../src/plugins/mail-to-task/mail-to-task.c:622
 #, fuzzy, c-format
 #| msgid ""
 #| "Selected calendar contains event '%s' already. Would you like to edit the old "
@@ -25990,7 +26489,7 @@ msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin lisättyä "
 "tapahtumaa?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:630
+#: ../src/plugins/mail-to-task/mail-to-task.c:625
 #, fuzzy, c-format
 #| msgid ""
 #| "Selected task list contains task '%s' already. Would you like to edit the old "
@@ -26001,7 +26500,7 @@ msgstr ""
 "Valittu tehtävälista sisältää jo tehtävän \"%s\". Haluatko muokata aiemmin "
 "lisättyä tehtävää?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:633
+#: ../src/plugins/mail-to-task/mail-to-task.c:628
 #, fuzzy, c-format
 #| msgid ""
 #| "Selected memo list contains memo '%s' already. Would you like to edit the old "
@@ -26013,7 +26512,7 @@ msgstr ""
 "lisättyä muistilappua?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:653
+#: ../src/plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to add "
@@ -26025,7 +26524,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:660
+#: ../src/plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to add "
@@ -26037,7 +26536,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:667
+#: ../src/plugins/mail-to-task/mail-to-task.c:662
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to add "
@@ -26048,30 +26547,30 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:688
+#: ../src/plugins/mail-to-task/mail-to-task.c:683
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:764
+#: ../src/plugins/mail-to-task/mail-to-task.c:759
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:777
+#: ../src/plugins/mail-to-task/mail-to-task.c:772
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:831
+#: ../src/plugins/mail-to-task/mail-to-task.c:826
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:869
+#: ../src/plugins/mail-to-task/mail-to-task.c:864
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:873
+#: ../src/plugins/mail-to-task/mail-to-task.c:868
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -26079,7 +26578,7 @@ msgstr ""
 "Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse jokin toinen kalenteri."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:876
+#: ../src/plugins/mail-to-task/mail-to-task.c:871
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -26091,7 +26590,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. Valitse "
 "joku toinen lähde."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:879
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
@@ -26103,35 +26602,35 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
 "Valitse joku toinen lähde."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1303
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1310
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1313
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1317
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1323
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1327
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -26332,75 +26831,75 @@ msgstr "Muokkaa sijaintia"
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../src/plugins/save-calendar/csv-format.c:158
+#: ../src/plugins/save-calendar/csv-format.c:154
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../src/plugins/save-calendar/csv-format.c:374
+#: ../src/plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../src/plugins/save-calendar/csv-format.c:375
+#: ../src/plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../src/plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Kommenttilista"
 
-#: ../src/plugins/save-calendar/csv-format.c:379
+#: ../src/plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../src/plugins/save-calendar/csv-format.c:380
+#: ../src/plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../src/plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Päättyy"
 
-#: ../src/plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Erääntyy"
 
-#: ../src/plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../src/plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../src/plugins/save-calendar/csv-format.c:386
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../src/plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../src/plugins/save-calendar/csv-format.c:561
+#: ../src/plugins/save-calendar/csv-format.c:537
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV-muodon _lisäasetukset"
 
-#: ../src/plugins/save-calendar/csv-format.c:569
+#: ../src/plugins/save-calendar/csv-format.c:545
 msgid "Prepend a _header"
 msgstr "Lisää otsake _ennen"
 
-#: ../src/plugins/save-calendar/csv-format.c:578
+#: ../src/plugins/save-calendar/csv-format.c:554
 msgid "_Value delimiter:"
 msgstr "_Arvojen erotin:"
 
-#: ../src/plugins/save-calendar/csv-format.c:589
+#: ../src/plugins/save-calendar/csv-format.c:565
 msgid "_Record delimiter:"
 msgstr "_Kenttien erotin:"
 
-#: ../src/plugins/save-calendar/csv-format.c:600
+#: ../src/plugins/save-calendar/csv-format.c:576
 msgid "_Encapsulate values with:"
 msgstr "_Kapsuloi arvot käyttäen:"
 
-#: ../src/plugins/save-calendar/csv-format.c:626
+#: ../src/plugins/save-calendar/csv-format.c:602
 msgid "Comma separated values (.csv)"
 msgstr "Pilkuin erotetut arvot (.csv)"
 
@@ -26425,7 +26924,7 @@ msgstr "Tallenna kalenteri tai tehtävälista levylle."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../src/plugins/save-calendar/rdf-format.c:383
+#: ../src/plugins/save-calendar/rdf-format.c:373
 msgid "RDF (.rdf)"
 msgstr "RDF-tiedostot (.rdf)"
 
@@ -26461,9 +26960,8 @@ msgid ""
 msgstr ""
 
 #: ../src/plugins/templates/templates.c:878
-#, fuzzy
 msgid "Saving message template"
-msgstr "Tallennetaan viestiä kansioon"
+msgstr "Tallennetaan viestipohjaa"
 
 #: ../src/plugins/templates/templates.c:899
 msgid "Save as _Template"
@@ -26474,38 +26972,38 @@ msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
 #: ../src/shell/e-shell.c:379
-msgid "Preparing to go offline..."
-msgstr "Valmistellaan verkotonta tilaa..."
+msgid "Preparing to go offline…"
+msgstr "Valmistellaan verkkoyhteydetöntä tilaa…"
 
 #: ../src/shell/e-shell.c:408
-msgid "Preparing to go online..."
-msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
+msgid "Preparing to go online…"
+msgstr "Valmistellaan verkkoyhteydellistä tilaa…"
 
 #: ../src/shell/e-shell.c:519
 msgid "Preparing to quit"
 msgstr "Valmistellaan sulkemista"
 
 #: ../src/shell/e-shell.c:525
-msgid "Preparing to quit..."
-msgstr "Valmistellaan sulkemista..."
+msgid "Preparing to quit…"
+msgstr "Valmistellaan sulkemista…"
 
-#: ../src/shell/e-shell.c:1074
+#: ../src/shell/e-shell.c:1088
 msgid "Open _Settings"
 msgstr "_Avaa asetukset"
 
-#: ../src/shell/e-shell.c:1281
+#: ../src/shell/e-shell.c:1297
 msgid "Credentials are required to connect to the destination host."
 msgstr "Tilitiedot vaaditaan etäpalvelimeen yhdistämiseksi."
 
-#: ../src/shell/e-shell.c:1448 ../src/shell/e-shell-window-actions.c:873
+#: ../src/shell/e-shell.c:1464 ../src/shell/e-shell-window-actions.c:891
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../src/shell/e-shell.c:1459 ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:821
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/shell/e-shell.c:1460 ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:919
 msgid "_Quit"
 msgstr "_Lopeta"
 
@@ -26527,13 +27025,13 @@ msgstr "Nä_ytä:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:950
+#: ../src/shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1018
+#: ../src/shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr "lä_hteestä"
 
@@ -26577,293 +27075,301 @@ msgstr ""
 "  papukaija https://launchpad.net/~papukaija";
 
 #: ../src/shell/e-shell-utils.c:354
-msgid "Evolution Website"
-msgstr "Evolutionin www-sivut"
+msgid "Website"
+msgstr "Verkkosivusto"
 
 #: ../src/shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Tallennetaan käyttöliittymän tilaa"
 
-#: ../src/shell/e-shell-window-actions.c:293
+#: ../src/shell/e-shell-window-actions.c:311
 msgid "Categories Editor"
 msgstr "Luokkamuokkain"
 
-#: ../src/shell/e-shell-window-actions.c:596
+#: ../src/shell/e-shell-window-actions.c:614
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../src/shell/e-shell-window-actions.c:597
+#: ../src/shell/e-shell-window-actions.c:615
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../src/shell/e-shell-window-actions.c:793
+#: ../src/shell/e-shell-window-actions.c:811
 msgid "Collect_ion Account"
 msgstr "_Kokoelmatili"
 
-#: ../src/shell/e-shell-window-actions.c:795
+#: ../src/shell/e-shell-window-actions.c:813
 msgid "Create a new collection account"
 msgstr "Luo uusi kokoelmatili"
 
-#: ../src/shell/e-shell-window-actions.c:805
+#: ../src/shell/e-shell-window-actions.c:823
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:828
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:830
 msgid "Configure Evolution Accounts"
 msgstr "Määritä Evolution-tilit"
 
-#: ../src/shell/e-shell-window-actions.c:817
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:835
+#: ../src/shell/e-shell-window-actions.c:849
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:856
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/shell/e-shell-window-actions.c:840
+#: ../src/shell/e-shell-window-actions.c:858
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../src/shell/e-shell-window-actions.c:866
-msgid "I_mport..."
-msgstr "_Tuo..."
+#: ../src/shell/e-shell-window-actions.c:884
+msgid "I_mport…"
+msgstr "_Tuo…"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:886
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:893
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../src/shell/e-shell-window-actions.c:903
+#: ../src/shell/e-shell-window-actions.c:921
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../src/shell/e-shell-window-actions.c:908
-msgid "_Advanced Search..."
-msgstr "_Oma haku..."
+#: ../src/shell/e-shell-window-actions.c:926
+msgid "_Advanced Search…"
+msgstr "_Edistynyt haku…"
 
-#: ../src/shell/e-shell-window-actions.c:910
+#: ../src/shell/e-shell-window-actions.c:928
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:922
-msgid "_Edit Saved Searches..."
-msgstr "_Muokkaa tallennettuja hakuja..."
+#: ../src/shell/e-shell-window-actions.c:940
+msgid "_Edit Saved Searches…"
+msgstr "_Muokkaa tallennettuja hakuja…"
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:954
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../src/shell/e-shell-window-actions.c:938
+#: ../src/shell/e-shell-window-actions.c:956
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:943
-msgid "_Save Search..."
-msgstr "_Tallenna haku..."
+#: ../src/shell/e-shell-window-actions.c:961
+msgid "_Save Search…"
+msgstr "Tallenna _haku…"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:957
-msgid "Submit _Bug Report..."
-msgstr "Lähetä _vikailmoitus..."
+#: ../src/shell/e-shell-window-actions.c:975
+msgid "_Keyboard Shortcuts"
+msgstr "_Pikanäppäimet"
+
+#: ../src/shell/e-shell-window-actions.c:977
+msgid "Show keyboard shortcuts"
+msgstr "Näytä pikanäppäimet"
+
+#: ../src/shell/e-shell-window-actions.c:982
+msgid "Submit _Bug Report…"
+msgstr "Lähetä _vikailmoitus…"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:984
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:998
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Lay_out"
 msgstr "_Asettelu"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1034
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1041
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1048
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1062
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1091
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1093
 msgid "Show the menu bar"
 msgstr "Näytä valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1099
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../src/shell/e-shell-window-actions.c:1076
+#: ../src/shell/e-shell-window-actions.c:1101
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1107
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1109
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1090
+#: ../src/shell/e-shell-window-actions.c:1115
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1123
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1125
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1147
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../src/shell/e-shell-window-actions.c:1129
+#: ../src/shell/e-shell-window-actions.c:1154
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1131
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1136
+#: ../src/shell/e-shell-window-actions.c:1161
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1168
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1145
+#: ../src/shell/e-shell-window-actions.c:1170
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
 
-#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/shell/e-shell-window-actions.c:1178
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1160
-msgid "Save Custom View..."
-msgstr "Tallenna oma näkymä..."
+#: ../src/shell/e-shell-window-actions.c:1185
+msgid "Save Custom View…"
+msgstr "Tallenna oma näkymä…"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1187
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1169
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1179
+#: ../src/shell/e-shell-window-actions.c:1204
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1206
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1189
-msgid "Page Set_up..."
-msgstr "_Sivun asetukset..."
+#: ../src/shell/e-shell-window-actions.c:1214
+msgid "Page Set_up…"
+msgstr "_Sivun asetukset…"
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1216
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../src/shell/e-shell-window-actions.c:1561
+#: ../src/shell/e-shell-window-actions.c:1586
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../src/shell/e-shell-window-actions.c:1684
+#: ../src/shell/e-shell-window-actions.c:1709
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1701
+#: ../src/shell/e-shell-window-actions.c:1726
 #, c-format
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1805
+#: ../src/shell/e-shell-window-actions.c:1830
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../src/shell/e-shell-window.c:563
+#: ../src/shell/e-shell-window.c:514
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Uusi"
@@ -26927,7 +27433,7 @@ msgstr "Älä kerro tätä uudestaan"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:312
+#: ../src/shell/main.c:325
 #, fuzzy
 #| msgid ""
 #| "Start Evolution showing the specified component. Available options are 'mail', "
@@ -26939,40 +27445,40 @@ msgstr ""
 "Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat ovat "
 "'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
 
-#: ../src/shell/main.c:316
+#: ../src/shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:333
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:335
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../src/shell/main.c:325
+#: ../src/shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../src/shell/main.c:328
+#: ../src/shell/main.c:341
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../src/shell/main.c:334
+#: ../src/shell/main.c:347
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:349
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../src/shell/main.c:418
+#: ../src/shell/main.c:431
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. System "
@@ -26981,11 +27487,11 @@ msgstr ""
 "Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa olla "
 "reagoimaton. Järjestelmävirhe: %s"
 
-#: ../src/shell/main.c:474 ../src/shell/main.c:479
+#: ../src/shell/main.c:490 ../src/shell/main.c:495
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../src/shell/main.c:541
+#: ../src/shell/main.c:551
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26994,7 +27500,7 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../src/shell/main.c:547
+#: ../src/shell/main.c:557
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -27003,6 +27509,10 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
+#: ../src/shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "Tuodaan..."
+
 #: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "Päivitys edellisestä versiosta epäonnistui:"
@@ -27244,8 +27754,8 @@ msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
 #: ../src/smime/gui/certificate-manager.c:648
-msgid "Select a file to backup your key and certificate..."
-msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen..."
+msgid "Select a file to backup your key and certificate…"
+msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen…"
 
 #. To Translators:
 #. * %s-backup.p12 is the default file name suggested by the file selection dialog,
@@ -27268,8 +27778,8 @@ msgstr "_Tiedostonimi:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../src/smime/gui/certificate-manager.c:741
-msgid "Please select a file..."
-msgstr "Valitse tiedosto..."
+msgid "Please select a file…"
+msgstr "Valitse tiedosto…"
 
 #: ../src/smime/gui/certificate-manager.c:755
 msgid "_Include certificate chain in the backup"
@@ -27309,8 +27819,8 @@ msgid "Failed to backup key and certificate"
 msgstr "Avaimen ja varmenteen varmuuskopiointi epäonnistui"
 
 #: ../src/smime/gui/certificate-manager.c:948
-msgid "Select a certificate to import..."
-msgstr "Valitse tuotava varmenne..."
+msgid "Select a certificate to import…"
+msgstr "Valitse tuotava varmenne…"
 
 #: ../src/smime/gui/certificate-manager.c:997
 msgid "Failed to import certificate"
@@ -27569,11 +28079,11 @@ msgid "C_ertificate:"
 msgstr "_Varmenne:"
 
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:400
+#: ../src/smime/lib/e-cert.c:402
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../src/smime/lib/e-cert.c:401
+#: ../src/smime/lib/e-cert.c:403
 msgid "Encrypt"
 msgstr "Salaa"
 
@@ -27622,17 +28132,239 @@ msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d viikko"
+#~ msgstr[1] "%d viikkoa"
+
+#~ msgctxt "cal-task-status"
+#~ msgid "None"
+#~ msgstr "Ei mitään"
+
+#~ msgid "_Attachment..."
+#~ msgstr "_Liite..."
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "_Osanottajat..."
+
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d päivä ennen"
+#~ msgstr[1] "%d päivää ennen"
+
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d tunti ennen"
+#~ msgstr[1] "%d tuntia ennen"
+
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d minuutti ennen"
+#~ msgstr[1] "%d minuuttia ennen"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "15 minuuttia ennen"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "1 tunti ennen"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "1 päivä ennen"
+
+#, fuzzy
+#~| msgid "Ca_tegories..."
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "Ry_hmät..."
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "Ei aloitettu"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "Työn alla"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "Valmis"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "Peruttu"
+
+#~ msgid "Saving changes..."
+#~ msgstr "Tallennetaan muutoksia..."
+
+#~ msgid "_Print..."
+#~ msgstr "T_ulosta..."
+
+#~ msgid "Pre_view..."
+#~ msgstr "E_sikatselu..."
+
+#~ msgid "Select..."
+#~ msgstr "Valitse..."
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "_Osanottajat..."
+
+#~ msgid "New _Appointment..."
+#~ msgstr "Uusi t_apaaminen..."
+
+#~ msgid "New _Meeting..."
+#~ msgstr "Uusi _kokous..."
+
+#~ msgid "New _Task..."
+#~ msgstr "Uusi _tehtävä..."
+
+#~ msgid "_Open..."
+#~ msgstr "_Avaa..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Poista..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Tallenna _nimellä..."
+
+#~ msgid "A_dd Attachment..."
+#~ msgstr "_Lisää liite..."
+
+#~ msgid "Other..."
+#~ msgstr "Muut..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Etsi..."
+
+#~ msgid "Re_place..."
+#~ msgstr "_Korvaa..."
+
+#~ msgid "_Image..."
+#~ msgstr "_Kuva..."
+
+#~ msgid "_Link..."
+#~ msgstr "_Linkki..."
+
+#~ msgid "_Rule..."
+#~ msgstr "_Viiva..."
+
+#~ msgid "_Table..."
+#~ msgstr "_Taulukko..."
+
+#~ msgid "Cell..."
+#~ msgstr "Solu..."
+
+#~ msgid "Image..."
+#~ msgstr "Kuva..."
+
+#~ msgid "Link..."
+#~ msgstr "Linkki..."
+
+#~ msgid "Page..."
+#~ msgstr "Sivu..."
+
+#~ msgid "Rule..."
+#~ msgstr "Viiva..."
+
+#~ msgid "Table..."
+#~ msgstr "Taulukko..."
+
+#~ msgid "Text..."
+#~ msgstr "Text..."
+
+#~ msgid "More..."
+#~ msgstr "Lisää..."
+
+#~ msgid "Add a C_olumn..."
+#~ msgstr "Lisää _sarake..."
+
+#~ msgid "Custo_mize Current View..."
+#~ msgstr "_Mukauta nykyistä näkymää..."
+
+#~ msgid "Save _Image..."
+#~ msgstr "Tal_lenna kuva..."
+
+#~ msgid "Storing changes..."
+#~ msgstr "Tallennetaan muutoksia..."
+
+#~ msgid "Retrieving message..."
+#~ msgstr "Noudetaan viestiä..."
+
+#~ msgid "_Archive..."
+#~ msgstr "_Arkistoi..."
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopioi kansioon..."
+
+#~ msgid "Follow _Up..."
+#~ msgstr "_Vastaa viestiin..."
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Siirrä kansioon..."
+
+#~ msgid "Loading..."
+#~ msgstr "Ladataan..."
+
+#~ msgid "_Forward Contact..."
+#~ msgstr "_Välitä yhteystieto..."
+
+#~ msgid "_New Contact..."
+#~ msgstr "_Uusi yhteystieto..."
+
+#~ msgid "New Contact _List..."
+#~ msgstr "Uusi yhteystieto_luettelo..."
+
+#~ msgid "_Send Message to Contact..."
+#~ msgstr "Lähetä _viesti henkilölle..."
+
+#~ msgid "_Save as vCard..."
+#~ msgstr "_Tallenna vCard-muodossa..."
+
+#~ msgid "_Copy..."
+#~ msgstr "_Kopioi..."
+
+#~ msgid "New All Day _Event..."
+#~ msgstr "Uusi koko pä_ivän tapahtuma..."
+
+#~ msgid "Print..."
+#~ msgstr "Tulosta..."
+
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "_Tallenna iCalendar-muodossa..."
+
+#~ msgid "_Copy Folder To..."
+#~ msgstr "_Kopioi kansio..."
+
+#~ msgid "_Move Folder To..."
+#~ msgstr "_Siirrä kansio..."
+
+#~ msgid "_New..."
+#~ msgstr "_Uusi..."
+
+#~ msgid "Preparing to quit..."
+#~ msgstr "Valmistellaan sulkemista..."
+
+#~ msgid "Evolution Website"
+#~ msgstr "Evolutionin www-sivut"
+
+#~ msgid "I_mport..."
+#~ msgstr "_Tuo..."
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "_Oma haku..."
+
+#~ msgid "_Save Search..."
+#~ msgstr "_Tallenna haku..."
+
 #~ msgid "Summary:"
 #~ msgstr "Kuvaus:"
 
 #~ msgid "%d/%m/%Y"
 #~ msgstr "%d.%m.%Y"
 
-#, fuzzy
-#~| msgid "Default reminder value"
-#~ msgid "Default reminder snooze interval, in minutes"
-#~ msgstr "Muistutuksen oletusarvo"
-
 #, fuzzy
 #~| msgctxt "iCalImp"
 #~| msgid "has reminders"
@@ -27696,9 +28428,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "_Snooze"
 #~ msgstr "_Torku"
 
-#~ msgid "_Print"
-#~ msgstr "_Tulosta"
-
 #~ msgid "location of appointment"
 #~ msgstr "tapaamisen sijainti"
 
@@ -28136,9 +28865,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "_Delegatees"
 #~ msgstr "_Valtuutetut"
 
-#~ msgid "Atte_ndees"
-#~ msgstr "_Osanottajat"
-
 #~ msgctxt "eventpage"
 #~ msgid "15 minutes before appointment"
 #~ msgstr "15 minuuttia ennen tapaamista"



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