[evolution] Update Finnish translation



commit 5b48b844d4902e4da19f41fd52ac2e0e3b094fd6
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Fri Aug 17 18:37:42 2018 +0000

    Update Finnish translation

 po/fi.po | 5605 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2987 insertions(+), 2618 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 903be57458..e2af10cc05 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -18,10 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-31 11:35+0000\n"
-"PO-Revision-Date: 2018-02-07 19:20+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
+"POT-Creation-Date: 2018-08-12 22:10+0000\n"
+"PO-Revision-Date: 2018-08-17 21:37+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -31,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
 "X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -471,94 +470,93 @@ msgid "Units for a default reminder, “minutes”, “hours” or “days”"
 msgstr "Oletusmuistutusten yksikkö, \"minutes\", \"hours\" tai \"days\"."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Default reminder value"
-msgid "Default reminder snooze interval, in minutes"
-msgstr "Muistutuksen oletusarvo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid ""
-"Default reminder snooze interval, in minutes, to be filled in the reminder "
-"notification dialog"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Näytä luokkakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Näytetäänkö luokkakenttä tapahtuman tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Näytä roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Näytetäänkö roolikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Näytä RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Näytetäänkö RSVP-kenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Näytetäänkö tilakenttä tapahtuman, tehtävät tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Näytä aikavyöhyke tapahtuman tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Näytetäänkö aikavyöhykekenttä tapahtuman tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Näytä tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Näytetäänkö tyyppikenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Hide completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide task units"
 msgstr "Piilota tehtävien yksiköt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 #, fuzzy
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr ""
 "Yksikkö, jonka avulla päätetään milloin tehtäviä piilotetaan. Arvot \"minutes\", "
 "\"hours\" tai \"days\"."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task value"
 msgstr "Piilota tehtävän arvo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 #, fuzzy
 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 completed tasks"
+msgid "Hide cancelled tasks"
+msgstr "Piilota valmistuneet tehtävät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#, fuzzy
+msgid "Whether to hide cancelled tasks in the tasks view"
+msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Horizontal pane position"
 msgstr "Vaakapaneelin sijainti"
@@ -584,80 +582,69 @@ msgstr "Viimeisimmän hälytyksen suoritusaika, time_t-yksikkönä."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 #, fuzzy
-#| msgctxt "iCalImp"
-#| msgid "has reminders"
-msgid "Allow past reminders"
-msgstr "sisältää muistutuksia"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid "Whether can show reminders for events/tasks/memos which already happened"
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#, fuzzy
 #| msgid "Marcus Bains Line Color - Day View"
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Marcus Bains -viivan väri - päivänäkymä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 #, fuzzy
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Marcus Bains -viivan väri päivänäkymässä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 #, fuzzy
 #| msgid "Marcus Bains Line Color - Time bar"
 msgid "Marcus Bains Line Color — Time bar"
 msgstr "Marcus Bains -viivan väri - aikajana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 #, fuzzy
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr "Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains -viiva"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #, fuzzy
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "Piirretäänkö Marcus Bains -viiva (viiva nykyhetkessä) kalenteriin."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Memo preview pane position (horizontal)"
 msgstr "Muistilappujen esikatselupaneelin sijainti (vaaka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 #, fuzzy
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo layout style"
 msgstr "Muistilappujen asettelutyyli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "memo list. “0” (Classic View) places the preview pane below the memo list. "
 "“1” (Vertical View) places the preview pane next to the memo list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
 msgstr "Muistilappujen esikatselupaneelin sijainti (pysty)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #, fuzzy
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Month view horizontal pane position"
 msgstr "Kuukausinäkymän vaakapaneelin sijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator calendar "
@@ -666,87 +653,57 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan välissä "
 "käytettäessä kuukausinäkymää."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 #, fuzzy
 msgid "Scroll Month View by a week, not by a month"
 msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 #, fuzzy
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "Reminder programs"
-msgstr "Muistutusohjelmat"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#, fuzzy
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Ohjelmat, joita voidaan suorittaa hälytyksistä."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-#, fuzzy
-msgid "Show display reminders in notification tray"
-msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#, fuzzy
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#, fuzzy
-msgid "Show reminder notification dialog always on top"
-msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"Whether or not to show reminder notification dialog always on top. Note this works "
-"only as a hint for the window manager, which may or may not obey it."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Preferred New button item"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Name of the preferred New toolbar button item"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Primary calendar"
 msgstr "Ensisijainen kalenteri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the “Calendar” "
 "view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Primary memo list"
 msgstr "Ensisijainen muistilappulista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the “Memos” view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary task list"
 msgstr "Ensisijainen tehtävälista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the “Tasks” view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Free/busy template URL"
 msgstr "Vapaa/varattu-mallin osoite"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 #, fuzzy, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the user "
@@ -755,164 +712,152 @@ msgstr ""
 "URL-malli, jota käytetään vapaa/varattu-tiedon varaosoitteena. %u korvataan "
 "sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Recurrent Events in Italic"
 msgstr "Toistuvat tapahtumat kursivoituna"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Search range for time-based searching in years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid ""
 "How many years can the time-based search go forward or backward from currently "
 "selected day when searching for another occurrence; default is ten years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Show appointment end times in week and month views"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 #, fuzzy
 #| msgid "Show appointment end times in week and month views"
 msgid "Show appointment icons in the month view"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 #, fuzzy
 msgid "Whether to show icons of events in the month view"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show the memo preview pane"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #, fuzzy
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #, fuzzy
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #, fuzzy
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 #, fuzzy
 msgid "Vertical position for the tag pane"
 msgstr "Pystysijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Highlight tasks due today"
 msgstr "Korosta tänään erääntyvät tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 #, fuzzy
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used together "
 "with task-due-today-highlight"
 msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Task preview pane position (horizontal)"
 msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Task layout style"
 msgstr "Tehtävien asettelutapa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "task list. “0” (Classic View) places the preview pane below the task list. "
 "“1” (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task preview pane position (vertical)"
 msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #, fuzzy
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-#, fuzzy
-#| msgid "Hide completed tasks"
-msgid "Show reminders for completed tasks"
-msgstr "Piilota valmistuneet tehtävät"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-msgid ""
-"Whether to show reminders for completed tasks. When set to false, reminders for "
-"completed tasks are suppressed."
-msgstr ""
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Highlight overdue tasks"
 msgstr "Korosta eräpäivän ylittäneet tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Overdue tasks color"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #, fuzzy
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used together "
 "with task-overdue-highlight."
 msgstr "Eräpäivän ylittäneiden tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Päivä- ja viikkonäkymissä näytettävät aikavälit minuutteina."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
@@ -921,103 +866,109 @@ msgstr ""
 "Oletusaikavyöhyke käytettävissä päivämäärissä ja kalenterissa, muodossa "
 "kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/Helsinki\"."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Twenty four hour time format"
 msgstr "24 tunnin kello"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 #, fuzzy
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Birthday and anniversary reminder"
 msgstr "Syntymä- ja vuosipäivämuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 #, fuzzy
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Default appointment reminder"
 msgstr "Tapaamisen oletusmuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 #, fuzzy
 msgid "Whether to set a default reminder for appointments"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Use system timezone"
 msgstr "Käytä järjestelmän aikavyöhykettä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "First day of the week"
 msgstr "Viikon ensimmäinen päivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Monday is a work day"
 msgstr "Maanantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Tuesday is a work day"
 msgstr "Tiistai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Wednesday is a work day"
 msgstr "Keskiviikko on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Thursday is a work day"
 msgstr "Torstai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Friday is a work day"
 msgstr "Perjantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Saturday is a work day"
 msgstr "Lauantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Sunday is a work day"
 msgstr "Sunnuntai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Create events, memos and tasks as Private by default"
 msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksityisenä oletuksena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Draw events as flat, not shaded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid ""
 "Whether to order days in the Week View from left to right, rather than from top to "
 "bottom."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+msgid ""
+"Allow direct edit of event Summary when clicking on it in the Day, Work Week, Week "
+"or Month view."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 #, 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:163
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 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:164
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) Work days"
 msgstr "(Vanhennettu) Työpäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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-"
@@ -1510,28 +1461,38 @@ msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Whether to obey Content-Disposition:inline message header hint"
+msgid "Convert UTC time in reply credits to local time"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
+"Whether the time in reply credits should be converted to local time when it’s in "
+"UTC in the message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid ""
 "Set to “false” to block automatic display of attachments with Content-Disposition: "
 "inline."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Save file format for drag-and-drop operation"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Voi olla joko “mbox” tai “pdf”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images annoying and "
 "prefer to see a static image instead."
@@ -1539,21 +1500,21 @@ msgstr ""
 "Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat ovat "
 "ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Enable or disable magic space bar"
 msgstr "Käytetäänkö maagista välilyöntinäppäintä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list and "
 "folders."
@@ -1561,197 +1522,197 @@ msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\""
 msgid "Mark citations in the message “Preview”"
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\"."
 msgid "Mark citations in the message “Preview”."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat HTTP:n yli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show notification about missing remote content"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then show a "
 "notification about it on top of the preview panel."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Show all the headers when viewing a messages."
 msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "List of headers to show when viewing a message."
 msgstr "Luettelo otsakkeista, jotka näytetään viestiä katsellessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean indicating "
 "whether the header is enabled. Disabled headers are not shown when viewing a "
 "message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 #, fuzzy
 #| msgid "Mark as Seen after specified timeout"
 msgid "Mark as Seen always after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout also "
 "after the folder change."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 #, fuzzy
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show Attachment Bar"
 msgstr "Näytä liitepalkki"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "Show the email-address of the sender in a separate column in the message list."
 msgstr "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show junk messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 #, fuzzy
 #| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "Ota hakunäkymät käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if Search "
 "Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 #, fuzzy
 #| msgid ""
 #| "This key is read only once and reset to \"false\" after read. This unselects "
@@ -1763,66 +1724,66 @@ msgstr ""
 "Tämä avain luetaan kerran, ja nollataan arvoksi \"false\" lukemisen jälkeen.  Tämä "
 "peruu sähköpostin valinnan luettelosta ja poistaa esikatselun kansiolta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "message list. “0” (Classic View) places the preview pane below the message list. "
 "“1” (Vertical View) places the preview pane next to the message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen fontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Terminal font"
 msgstr "Päätteen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Päätefontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Use custom fonts"
 msgstr "Käytä omia fontteja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia fontteja näytettäessä viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1830,11 +1791,11 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 #, fuzzy
 #| msgid ""
 #| "This sets the number of addresses to show in default message list view, beyond "
@@ -1846,11 +1807,24 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin lukumäärän, "
 "jonka jälkeen näytetään '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show mails in headers part of the message preview when name is available"
+msgstr "Näytä viestin esikatselu viestiluettelon alla"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+msgid ""
+"When set to false, the mail addresses which contain both the name and the email "
+"parts in headers like To/Cc/Bcc will be shown only with the name part, without the "
+"actual email, with the name made clickable."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
@@ -1858,11 +1832,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "This setting specifies whether the threads should be in expanded or collapsed "
 "state by default. Evolution requires a restart."
@@ -1870,11 +1844,11 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. Muutos "
 "vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Järjestetäänkö säikeet säikeen viimeisen viestin mukaan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on latest "
@@ -1888,11 +1862,11 @@ msgstr ""
 "Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
 "viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on latest "
@@ -1905,109 +1879,109 @@ msgstr ""
 "Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
 "viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to true "
 "accounts are sorted alphabetically, with an exception of On This Computer and "
 "Search folders, otherwise accounts are sorted based on an order given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead to a "
 "file."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen only "
 "when there was used any “Forward to” filter action and approximately one minute "
 "after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
 "Prompt the user when he or she tries to send a message with a key accelerator."
 msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Kysy vahvistus käyttäjältä, kun roskakoria ollaan tyhjentämässä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when user calls Empty Junk"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Seuraavia vastaanottajia ei tunnistettu kelvollisiksi sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send a "
@@ -2016,20 +1990,20 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-kenttiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2037,11 +2011,11 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka eivät "
 "sellaista halua vastaanottaa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if they "
 "really want to do it."
@@ -2049,19 +2023,19 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko todella "
 "tehdä sen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Näytetäänkö kehto merkittäessä useita viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from a "
 "search folder permanently deletes the message, not simply removing it from the "
@@ -2070,34 +2044,34 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of folders "
 "in folder tree, “always” — allow copy with drag &amp; drop of folders in folder "
 "tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of folders "
 "in folder tree, “always” — allow move with drag &amp; drop of folders in folder "
 "tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a private "
@@ -2106,24 +2080,24 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending a "
 "private reply to a message which arrived via a mailing list, but the list sets a "
 "Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a reply to "
@@ -2132,7 +2106,7 @@ msgstr ""
 "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko synkronointia "
 "yhteydettömään tilaan siirryttäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 #, fuzzy
 msgid ""
 "Prompt when switching composer format and the content needs to lose its formatting"
@@ -2140,7 +2114,7 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching composer "
@@ -2149,57 +2123,57 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 #, fuzzy
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "Policy for automatically closing the message browser window when forwarding or "
 "replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #, fuzzy
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Aika sekunteina, kuinka pitkään virheet näytetään tilarivillä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 #, fuzzy
 #| msgid ""
 #| "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
@@ -2211,24 +2185,24 @@ msgstr ""
 "Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1\" (varoitukset) "
 "tai \"2\" (vianetsintäviestit)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 #, fuzzy
 #| msgid "Show original \"Date\" header value."
 msgid "Show original “Date” header value."
 msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone differs). "
 "Otherwise always show “Date” header value in a user preferred format and local "
 "time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains strings "
 "containing name:color where color uses the HTML hex encoding."
@@ -2236,45 +2210,45 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri pareja, "
 "joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 #, fuzzy
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 #, fuzzy
 #| msgid ""
 #| "This is the default junk plugin, even though there are multiple plugins "
@@ -2288,11 +2262,11 @@ msgstr ""
 "Tämä on roskapostin käsittelyn oletuslisäosa, vaikka useita olisi käytössä. Jos "
 "oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä olevia lisäosia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 #, fuzzy
 #| msgid ""
 #| "Determines whether to lookup the sender email in address book. If found, it "
@@ -2308,7 +2282,7 @@ msgstr ""
 "valittu automaattista täydennystä varten. Tämä haku voi olla hidas, jos osoitteita "
 "täydennetään esimerkiksi LDAP-osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address book "
 "only"
@@ -2316,7 +2290,7 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta varten "
 "vain paikallisista osoitekirjoista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid ""
 "This option is related to the key lookup_addressbook and is used to determine "
 "whether to look up addresses in local address book only to exclude mail sent by "
@@ -2326,11 +2300,11 @@ msgstr ""
 "etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, joille ei tehdä "
 "roskapostisuodatusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option is "
 "enabled and the headers are mentioned, it will be improve the junk checking speed."
@@ -2338,11 +2312,11 @@ msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita. Jos tämä valinta on käytössä ja "
 "otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #, fuzzy
 #| msgid ""
 #| "Custom headers to use while checking for junk. The list elements are string in "
@@ -2354,52 +2328,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon kohdat "
 "ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "Check for new messages in all active accounts"
 msgstr "Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the account "
 "“Check for new messages every X minutes” option when Evolution is started. This "
 "option is used only together with “send_recv_on_start” option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2407,13 +2381,13 @@ msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan postipalvelimelle. "
 "Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Allow expunge in virtual folders"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will be "
 "callable in virtual folders, while the expunge itself will be done in all folders "
@@ -2421,185 +2395,255 @@ msgid ""
 "belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid ""
 "When enabled the theme colors for background, text and links are sent in resulting "
 "HTML formatted message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 #, fuzzy
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 #, fuzzy
 msgid "Width of the To Do bar in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 #, fuzzy
 #| msgid "Apply the given geometry to the main window"
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "Width of the To Do bar in a sub-window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 msgid "Show start up wizard"
 msgstr "Näytä käynnistyksen avustaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 msgid "Whether go to the previous message after message deletion"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 msgid ""
 "If set to true, goes to the previous message when the selected is deleted; or to "
 "the next message, when it’s set to false."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 msgid "Show Subject above Sender in Messages column"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, usually "
 "shown in the Vertical/Wide view of the message list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "Visually wrap long lines in composer"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 #: ../src/composer/e-composer-actions.c:552
 msgid "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#, fuzzy
+#| msgid "Default reply style"
+msgid "Alternative reply style"
+msgstr "Vastauksen oletustyyli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+msgid "Format message in HTML"
+msgstr "Muotoile viesti HTML:nä"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#, fuzzy
+#| msgid "Put the cursor at the bottom of replies"
+msgid "Put the cursor at the bottom of alternative replies"
+msgstr "Aseta osoitin viestin loppuun vastattaessa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+msgid ""
+"This determines whether the cursor is placed at the top of the message or the "
+"bottom when using Alternative Reply."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+msgid "Apply chosen template when using Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+msgid "Last chosen template’s folder URI for Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+msgid "Last chosen template’s message UID for Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+msgid ""
+"Whether preserve original message subject when applying template for Alternative "
+"Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+msgid ""
+"Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
+"“false”, then Normal paragraph style will be used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+msgid ""
+"Close the message browser window when the selected message is deleted or marked as "
+"Junk."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+msgid ""
+"Collapse archive folders in Move/Copy message to Folder and Go to Folder selectors."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+msgid ""
+"Where to lookup recipient S/MIME certificates or PGP keys when encrypting messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+msgid ""
+"The “off” value completely disables certificate lookup; the “autocompleted” value "
+"provides certificates only for auto-completed contacts; the “books” value uses "
+"certificates from auto-completed contacts and searches in books marked for auto-"
+"completion."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 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:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 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:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 #, 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:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 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:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 #, 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:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 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:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 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:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
 msgstr ""
 
-#. Translators: This is the a list of words for the attach reminder plugin to look
+#. Translators: This is a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
@@ -2643,35 +2687,43 @@ msgid "Whether contacts should be automatically added to the user’s address bo
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Whether to set “File under” field as “First Last”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "Set File under as “First Last”, instead of “Last, First”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin address book source"
 msgstr "Pidginin osoitekirjan lähde"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
 #, fuzzy
 msgid "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
 msgid "Pidgin check interval"
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
 msgid "Check interval for Pidgin syncing of contacts."
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
 msgid "Pidgin last sync MD5"
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
 msgid "Pidgin last sync MD5."
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:15
 msgid "Pidgin last sync time"
 msgstr ""
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:16
 msgid "Pidgin last sync time."
 msgstr ""
 
@@ -2819,6 +2871,16 @@ msgstr "Käytä ääniteemaa"
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
 
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:19
+#, fuzzy
+#| msgid "Edit properties of this account"
+msgid "Do not notify for these accounts"
+msgstr "Muokkaa tilin ominaisuuksia"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:20
+msgid "Contains UIDs of accounts for which the notifications should be avoided."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 #, fuzzy
 msgid "Mode to use when displaying mails"
@@ -3056,10 +3118,16 @@ 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."
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
 msgid "Theme name to use, defaults to “bclear”"
 msgstr "Käytettävän teeman nimi, oletuksena “bclear”"
 
-#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:3
 msgid ""
 "Use “highlight --list-scripts=themes” to get the list of installed themes and then "
 "the value to one of them. The change requires only re-format of the message part "
@@ -3067,7 +3135,7 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.h:1
-#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1112
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1190
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
@@ -3098,7 +3166,7 @@ msgstr ""
 "noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft Exchange -"
 "palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
 
-#: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:362
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
@@ -3122,17 +3190,17 @@ msgstr "Uusi viesti"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:307
-#: ../src/modules/addressbook/e-book-shell-view.c:371
+#: ../src/modules/addressbook/e-book-shell-backend.c:314
+#: ../src/modules/addressbook/e-book-shell-view.c:412
 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:559 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-collection-account-wizard.c:581 ../src/e-util/e-send-options.c:544
 #: ../src/e-util/e-webdav-browser.c:469
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:582
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:199
+#: ../src/modules/calendar/e-cal-shell-view.c:604
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Kalenteri"
@@ -3141,7 +3209,7 @@ 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:1249
+#: ../src/modules/mail/e-mail-shell-view.c:1483
 #: ../src/smime/gui/certificate-manager.c:1682
 msgid "Mail"
 msgstr "Sähköposti"
@@ -3149,33 +3217,25 @@ msgstr "Sähköposti"
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
 #: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
 #: ../src/modules/calendar/e-cal-shell-content.c:1719
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
-#: ../src/modules/calendar/e-memo-shell-view.c:313
+#: ../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
 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:2408
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1110
+#: ../src/calendar/importers/icalendar-importer.c:1109
 #: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 #: ../src/modules/calendar/e-cal-shell-content.c:1679
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
-#: ../src/modules/calendar/e-task-shell-view.c:471
+#: ../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
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolutionin hälytysilmoitukset"
-
-#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Kalenteritapahtumien ilmoitukset"
-
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Osoitekortit"
@@ -3390,18 +3450,18 @@ msgstr ""
 #: ../src/addressbook/addressbook.error.xml.h:31
 #: ../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:1359
-#: ../src/e-util/e-accounts-window.c:1526
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1433
+#: ../src/e-util/e-accounts-window.c:1562
 #: ../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:1031 ../src/mail/em-vfolder-editor-rule.c:397
-#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
+#: ../src/mail/em-folder-properties.c:1023 ../src/mail/em-vfolder-editor-rule.c:408
+#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:61
 #: ../src/modules/mail/em-composer-prefs.c:422
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:543
 #: ../src/plugins/email-custom-header/email-custom-header.c:837
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:463
+#: ../src/plugins/templates/templates.c:462
 msgid "_Add"
 msgstr "_Lisää"
 
@@ -3486,9 +3546,15 @@ msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 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 the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
 
+#: ../src/addressbook/addressbook.error.xml.h:48
+#, 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/gui/contact-editor/contact-editor.ui.h:1
 msgid "Show Telephone"
 msgstr "Näytä puhelin"
@@ -3553,7 +3619,7 @@ 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:1976
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
 #: ../src/mail/mail-config.ui.h:38
 msgid "Options"
 msgstr "Asetukset"
@@ -3563,7 +3629,7 @@ msgstr "Asetukset"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
 #: ../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
@@ -3579,25 +3645,26 @@ msgstr "Asetukset"
 #: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
 #: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:1563
-#: ../src/e-util/e-collection-account-wizard.c:1798
+#: ../src/e-util/e-collection-account-wizard.c:1586
+#: ../src/e-util/e-collection-account-wizard.c:1821
 #: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:289
 #: ../src/e-util/e-html-editor-actions.c:321
 #: ../src/e-util/e-html-editor-actions.c:415
 #: ../src/e-util/e-image-chooser-dialog.c:169
 #: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
-#: ../src/e-util/e-rule-context.c:813 ../src/e-util/e-rule-editor.c:187
-#: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:930
+#: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:187
+#: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:933
 #: ../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:4118
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4143
 #: ../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:168 ../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:867 ../src/mail/mail-send-recv.c:949
-#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:3960
+#: ../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:844
+#: ../src/mail/mail-send-recv.c:925 ../src/mail/mail-vfolder-ui.c:149
+#: ../src/mail/mail-vfolder-ui.c:271
 #: ../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
@@ -3607,7 +3674,7 @@ msgstr "Asetukset"
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
 #: ../src/plugins/save-calendar/save-calendar.c:185
-#: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
+#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
 #: ../src/smime/gui/certificate-manager.c:665
 #: ../src/smime/gui/certificate-manager.c:742
@@ -3625,9 +3692,9 @@ msgstr "_Peru"
 #: ../src/composer/e-composer-actions.c:230 ../src/composer/e-composer-actions.c:350
 #: ../src/e-util/e-attachment-store.c:833
 #: ../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:4119
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4144
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
+#: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:140
 #: ../src/smime/gui/certificate-manager.c:666
 #: ../src/smime/gui/certificate-manager.c:743
 msgid "_Save"
@@ -3637,7 +3704,7 @@ msgstr "_Tallenna"
 #: ../src/calendar/gui/e-comp-editor.c:2012 ../src/calendar/gui/e-comp-editor.c:2084
 #: ../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:1309 ../src/shell/e-shell-window-actions.c:994
+#: ../src/shell/e-shell.c:1458 ../src/shell/e-shell-window-actions.c:971
 msgid "_Help"
 msgstr "O_hje"
 
@@ -3700,8 +3767,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:725
-#: ../src/modules/itip-formatter/itip-view.c:2048
+#: ../src/calendar/gui/e-comp-editor-event.c:731
+#: ../src/modules/itip-formatter/itip-view.c:2049
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -3791,14 +3858,14 @@ 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/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2056
+#: ../src/calendar/gui/e-calendar-view.c:2079
 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/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2055
+#: ../src/calendar/gui/e-calendar-view.c:2078
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -3854,7 +3921,7 @@ msgstr "Työ"
 #: ../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:3805
+#: ../src/calendar/gui/e-cal-model.c:3820
 msgid "Other"
 msgstr "Muut"
 
@@ -3878,19 +3945,19 @@ 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:1375
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1449
 #: ../src/e-util/e-attachment-view.c:356 ../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/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1037 ../src/mail/em-vfolder-editor-rule.c:631
+#: ../src/mail/em-folder-properties.c:1029 ../src/mail/em-vfolder-editor-rule.c:642
 #: ../src/mail/mail-config.ui.h:62
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:553
 #: ../src/plugins/email-custom-header/email-custom-header.c:847
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:473
+#: ../src/plugins/templates/templates.c:472
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -3903,7 +3970,7 @@ msgid "_Load X.509"
 msgstr "_Lataa X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
-#: ../src/modules/addressbook/e-book-shell-backend.c:318
+#: ../src/modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
 msgstr "Varmenteet"
 
@@ -3969,7 +4036,7 @@ 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:4320
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4322
 #: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
 #: ../src/e-util/e-html-editor-actions.c:322
 #: ../src/e-util/e-html-editor-actions.c:416
@@ -4011,15 +4078,15 @@ msgstr "Tallenna X.509-varmenne"
 msgid "Failed to save certificate: %s"
 msgstr "Varmenteen tallentaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4318
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4027,28 +4094,28 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, 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:4692
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, 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:4705
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” on tyhjä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -4061,19 +4128,19 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/e-util/e-category-editor.c:212 ../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:290
 #: ../src/e-util/e-html-editor-link-dialog.c:255 ../src/e-util/e-passwords.c:469
-#: ../src/e-util/e-rule-context.c:814 ../src/e-util/e-rule-editor.c:188
-#: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:931
+#: ../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
 #: ../src/e-util/e-source-selector-dialog.c:371 ../src/e-util/e-table-config.c:549
 #: ../src/e-util/e-table-config.ui.h:4 ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
-#: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
+#: ../src/mail/mail-dialogs.ui.h:23 ../src/mail/mail-vfolder-ui.c:150
 #: ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
-#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
+#: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
 #: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
@@ -4212,12 +4279,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:3469 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3474 ../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:3470 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Alas"
 
@@ -4247,22 +4314,22 @@ msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1309
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1302
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../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:1211
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:782
-#: ../src/modules/calendar/e-task-shell-view-actions.c:983
+#: ../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
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -4292,7 +4359,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:1374
+#: ../src/e-util/e-web-view.c:1376
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -4456,12 +4523,12 @@ msgid "Blog"
 msgstr "Blogi"
 
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:314
-#: ../src/calendar/gui/e-cal-model-tasks.c:556 ../src/calendar/gui/e-task-table.c:210
+#: ../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:514 ../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:3586 ../src/calendar/gui/tasktypes.xml.in.h:14
-#: ../src/mail/mail-send-recv.c:1086
+#: ../src/calendar/gui/print.c:3591 ../src/calendar/gui/tasktypes.xml.in.h:14
+#: ../src/mail/mail-send-recv.c:1062
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -4657,7 +4724,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
@@ -4692,15 +4759,15 @@ 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:1714
+#: ../src/calendar/gui/e-comp-editor.c:2005 ../src/e-util/e-accounts-window.c:1750
 #: ../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/modules/addressbook/e-book-shell-view-actions.c:1093
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:676
-#: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../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:1503
+#: ../src/shell/e-shell-window-actions.c:836
 #: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Poista"
@@ -4899,7 +4966,7 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2500
+#: ../src/mail/e-mail-reader.c:2809
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
@@ -4907,7 +4974,7 @@ msgstr "L_oitonna"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:1872
 #: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/shell/e-shell-window-actions.c:906
 msgid "_Find"
 msgstr "_Etsi"
 
@@ -4969,46 +5036,46 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../src/addressbook/importers/evolution-csv-importer.c:749
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:479
-#: ../src/calendar/importers/icalendar-importer.c:972
-#: ../src/calendar/importers/icalendar-importer.c:1012
+#: ../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/addressbook/importers/evolution-csv-importer.c:927
+#: ../src/addressbook/importers/evolution-csv-importer.c:931
 msgid "Can’t open .csv file"
 msgstr ".csv-tiedostoa ei voi avata"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1096
+#: ../src/addressbook/importers/evolution-csv-importer.c:1100
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1097
+#: ../src/addressbook/importers/evolution-csv-importer.c:1101
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1105
+#: ../src/addressbook/importers/evolution-csv-importer.c:1109
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1106
+#: ../src/addressbook/importers/evolution-csv-importer.c:1110
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1114
+#: ../src/addressbook/importers/evolution-csv-importer.c:1118
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1115
+#: ../src/addressbook/importers/evolution-csv-importer.c:1119
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
@@ -5145,218 +5212,18 @@ msgstr "SIP"
 #. * IM=Instant Messaging
 #.
 #: ../src/addressbook/util/eab-book-util.c:214
-msgctxt "addressbook-label"
-msgid "IM"
-msgstr "Pikaviestin"
-
-#. To Translators:
-#. * if a phone number type is not one of the predefined types,
-#. * this generic label is used instead of one of the predefined labels.
-#.
-#: ../src/addressbook/util/eab-book-util.c:269
-msgctxt "addressbook-label"
-msgid "Phone"
-msgstr "Puhelin"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:105
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuutti"
-msgstr[1] "minuuttia"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:118
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "tunti"
-msgstr[1] "tuntia"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:131
-msgid "day"
-msgid_plural "days"
-msgstr[0] "päivä"
-msgstr[1] "päivä"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:373
-msgid "Start time"
-msgstr "Alkamisaika"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../src/calendar/alarm-notify/alarm-queue.c:2002
-msgid "Appointments"
-msgstr "Tapaamiset"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Hylkää _kaikki"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
-msgid "_Snooze"
-msgstr "_Torku"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1367
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
-#: ../src/calendar/gui/e-comp-editor.c:2070 ../src/e-util/e-accounts-window.c:1706
-#: ../src/e-util/e-html-editor-actions.c:922
-#: ../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:172 ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
-#: ../src/plugins/email-custom-header/email-custom-header.c:842
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:468 ../src/shell/e-shell-window-actions.c:980
-#: ../src/smime/gui/smime-ui.ui.h:11
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
-msgid "_Print"
-msgstr "_Tulosta"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
-#: ../src/e-util/e-alert-dialog.c:162
-msgid "_Dismiss"
-msgstr "_Hylkää"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../src/calendar/alarm-notify/alarm-queue.c:1969
-#: ../src/calendar/alarm-notify/alarm-queue.c:1979
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1792
-msgid "Location:"
-msgstr "Sijainti:"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "tapaamisen sijainti"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:9
-msgid "Snooze _time:"
-msgstr "Torkkumis_aika:"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "days"
-msgstr "päivä"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
-msgid "hours"
-msgstr "tuntia"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:579
-msgid "minutes"
-msgstr "minuutti"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1770
-#: ../src/calendar/alarm-notify/alarm-queue.c:1950
-msgid "No summary available."
-msgstr "Ei yhteenvetoa saatavilla."
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1779
-#: ../src/calendar/alarm-notify/alarm-queue.c:1781
-msgid "No description available."
-msgstr "Ei kuvausta saatavilla."
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1789
-msgid "No location information available."
-msgstr "Ei sijaintitietoja saatavilla."
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1794
-#: ../src/calendar/alarm-notify/alarm-queue.c:1941
-#: ../src/calendar/alarm-notify/alarm-queue.c:2292
-msgid "Evolution Reminders"
-msgstr "Evolution-muistuttajat"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1837
-#, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "Sinulla on %d muistutus"
-msgstr[1] "Sinulla on %d muistutusta"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2110
-msgid "Warning"
-msgstr "Varoitus"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2111 ../src/mail/mail-dialogs.ui.h:20
-msgid "_No"
-msgstr "_Ei"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2112
-msgid "_Yes"
-msgstr "_Kyllä"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2116
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to "
-"run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-"Evolution kalenterin muistutus laukeaa nyt. Muistutus on määritelty suorittamaan "
-"seuraavan ohjelman:\n"
-"\n"
-"         %s\n"
-"\n"
-"Haluatko varmasti suorittaa tämän ohjelman?"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2131
-msgid "Do not ask me about this program again."
-msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
-
-#: ../src/calendar/alarm-notify/util.c:65
-msgid "invalid time"
-msgstr "epäkelpo aika"
-
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/alarm-notify/util.c:91 ../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ää"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/alarm-notify/util.c:97 ../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/alarm-notify/util.c:103 ../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"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/alarm-notify/util.c:107 ../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"
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "Pikaviestin"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../src/addressbook/util/eab-book-util.c:269
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Puhelin"
 
 #: ../src/calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
@@ -6091,8 +5958,8 @@ msgstr "Jokin meni vikaan tapahtumaa näyttäessä"
 #: ../src/calendar/calendar.error.xml.h:174
 msgid ""
 "A WebKitWebProcess crashed when displaying the event. You can try again by moving "
-"to another event and back. If the issue persists, please file a bug report in the "
-"GNOME bugzilla."
+"to another event and back. If the issue persists, please file a bug report in "
+"GNOME Gitlab."
 msgstr ""
 
 #: ../src/calendar/calendar.error.xml.h:175
@@ -6104,8 +5971,8 @@ msgstr "Luo uusi ikkuna tälle näkymälle"
 #: ../src/calendar/calendar.error.xml.h:176
 msgid ""
 "A WebKitWebProcess crashed when displaying the memo. You can try again by moving "
-"to another memo and back. If the issue persists, please file a bug report in the "
-"GNOME bugzilla."
+"to another memo and back. If the issue persists, please file a bug report in GNOME "
+"Gitlab."
 msgstr ""
 
 #: ../src/calendar/calendar.error.xml.h:177
@@ -6115,8 +5982,8 @@ msgstr "Jokin meni vikaan tehtävää näyttäessä"
 #: ../src/calendar/calendar.error.xml.h:178
 msgid ""
 "A WebKitWebProcess crashed when displaying the task. You can try again by moving "
-"to another task and back. If the issue persists, please file a bug report in the "
-"GNOME bugzilla."
+"to another task and back. If the issue persists, please file a bug report in GNOME "
+"Gitlab."
 msgstr ""
 
 #: ../src/calendar/gui/caltypes.xml.in.h:1
@@ -6144,7 +6011,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:1655
+#: ../src/e-util/e-collection-account-wizard.c:1678
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6238,7 +6105,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:2002
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2011
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -6269,7 +6136,7 @@ msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
 #: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2365
+#: ../src/modules/itip-formatter/itip-view.c:2366
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
@@ -6278,7 +6145,6 @@ msgstr[1] ""
 
 #: ../src/calendar/gui/comp-util.c:1546
 #, c-format
-#| msgid "Comment:"
 msgid "Comments: %s"
 msgstr "Kommentit: %s"
 
@@ -6314,20 +6180,20 @@ msgstr "Sisältää toistuvuuksia."
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:245
+#: ../src/calendar/gui/ea-cal-view-event.c:242
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:248
+#: ../src/calendar/gui/ea-cal-view-event.c:246
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:271
+#: ../src/calendar/gui/ea-cal-view-event.c:269
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:503
+#: ../src/calendar/gui/ea-cal-view-event.c:501
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
@@ -6383,6 +6249,14 @@ 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ää"
+
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../src/calendar/gui/e-alarm-list.c:374
 #, c-format
@@ -6391,30 +6265,55 @@ msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
+#. 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:1811
+#: ../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:1809
+#: ../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:1815
+#: ../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: [ 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:1813
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1822
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Suorita ohjelma"
@@ -6510,110 +6409,116 @@ 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:214
-#: ../src/e-util/e-filter-rule.c:985 ../src/mail/e-mail-config-page.c:124
+#: ../src/calendar/gui/e-cal-component-preview.c:216
+#: ../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:222
+#: ../src/calendar/gui/e-cal-component-preview.c:224
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:256
+#: ../src/calendar/gui/e-cal-component-preview.c:258
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:264
+#: ../src/calendar/gui/e-cal-component-preview.c:266
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:275
+#: ../src/calendar/gui/e-cal-component-preview.c:277
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:286
+#: ../src/calendar/gui/e-cal-component-preview.c:288
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:298
-#: ../src/modules/itip-formatter/itip-view.c:1684
-#: ../src/modules/itip-formatter/itip-view.c:1801
+#: ../src/calendar/gui/e-cal-component-preview.c:300
+#, 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
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:302
-#: ../src/calendar/gui/e-cal-model-tasks.c:310
-#: ../src/calendar/gui/e-cal-model-tasks.c:552
-#: ../src/calendar/gui/e-cal-model-tasks.c:633 ../src/calendar/gui/e-task-table.c:206
+#: ../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:510
+#: ../src/calendar/gui/e-cal-model-tasks.c:591 ../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:3580
+#: ../src/calendar/gui/print.c:3585
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:305
-#: ../src/calendar/gui/e-cal-model-tasks.c:312
-#: ../src/calendar/gui/e-cal-model-tasks.c:554
+#: ../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:512
 #: ../src/calendar/gui/e-meeting-store.c:202
 #: ../src/calendar/gui/e-meeting-store.c:225 ../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:3583 ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/calendar/gui/print.c:3588 ../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:312
-#: ../src/calendar/gui/e-cal-model-tasks.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:550 ../src/calendar/gui/e-task-table.c:204
+#: ../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:508 ../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:3577 ../src/calendar/gui/tasktypes.xml.in.h:11
+#: ../src/calendar/gui/print.c:3582 ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:325
+#: ../src/calendar/gui/e-cal-component-preview.c:339
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:327
+#: ../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:327
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:328
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1890 ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:343
+#: ../src/calendar/gui/e-cal-model.c:1905 ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:326
+#: ../src/mail/message-list.c:327
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:331
+#: ../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:325
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:326
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/mail/e-mail-config-service-page.c:531
+#: ../src/calendar/gui/e-cal-component-preview.c:364
+#: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:381
+#: ../src/calendar/gui/e-cal-component-preview.c:395
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1631
+#: ../src/calendar/gui/e-cal-data-model.c:1696
 #, 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:1635
+#: ../src/calendar/gui/e-cal-data-model.c:1700
 #, 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:1639
+#: ../src/calendar/gui/e-cal-data-model.c:1704
 #, fuzzy, c-format
 #| msgid "Opening memo list '%s'"
 msgid "Creating view for memo list “%s”"
@@ -6654,7 +6559,7 @@ 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:1288
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
@@ -6751,45 +6656,45 @@ msgstr "Lähetä hälytys tälle tapahtumalle"
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../src/calendar/gui/e-calendar-view.c:451
+#: ../src/calendar/gui/e-calendar-view.c:464
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../src/calendar/gui/e-calendar-view.c:457
+#: ../src/calendar/gui/e-calendar-view.c:470
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../src/calendar/gui/e-calendar-view.c:463
+#: ../src/calendar/gui/e-calendar-view.c:476
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../src/calendar/gui/e-calendar-view.c:469
+#: ../src/calendar/gui/e-calendar-view.c:482
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../src/calendar/gui/e-calendar-view.c:853
+#: ../src/calendar/gui/e-calendar-view.c:866
 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:864 ../src/calendar/gui/e-cal-ops.c:1556
+#: ../src/calendar/gui/e-calendar-view.c:877 ../src/calendar/gui/e-cal-ops.c:1556
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:869 ../src/calendar/gui/e-cal-ops.c:1559
+#: ../src/calendar/gui/e-calendar-view.c:882 ../src/calendar/gui/e-cal-ops.c:1559
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../src/calendar/gui/e-calendar-view.c:874 ../src/calendar/gui/e-cal-ops.c:1562
+#: ../src/calendar/gui/e-calendar-view.c:887 ../src/calendar/gui/e-cal-ops.c:1562
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:963
+#: ../src/calendar/gui/e-calendar-view.c:976
 msgid "No suitable component found"
 msgstr "Soveltuvaa komponenttia ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:1033
+#: ../src/calendar/gui/e-calendar-view.c:1046
 #, fuzzy
 #| msgid "Save as iCalendar"
 msgid "Pasting iCalendar data"
@@ -6800,7 +6705,7 @@ msgstr "Tallenna iCalendar-muodossa"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1831 ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-calendar-view.c:1854 ../src/calendar/gui/e-memo-table.c:493
 #: ../src/calendar/gui/e-task-table.c:819
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -6809,7 +6714,7 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1835 ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-calendar-view.c:1858 ../src/calendar/gui/e-memo-table.c:498
 #: ../src/calendar/gui/e-task-table.c:823
 #, c-format
 msgid "Organizer: %s"
@@ -6817,24 +6722,24 @@ msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1851
-#: ../src/calendar/gui/e-meeting-time-sel.c:2671
-#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3531
+#: ../src/calendar/gui/e-calendar-view.c:1874
+#: ../src/calendar/gui/e-meeting-time-sel.c:2580
+#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3536
 #, 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:1891 ../src/calendar/gui/e-to-do-pane.c:438
+#: ../src/calendar/gui/e-calendar-view.c:1914 ../src/calendar/gui/e-to-do-pane.c:443
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2288
-#: ../src/calendar/gui/e-calendar-view.c:2295
-#: ../src/calendar/gui/e-calendar-view.c:2302
-#: ../src/calendar/gui/e-calendar-view.c:2305
+#: ../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
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -6843,13 +6748,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:2293 ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-calendar-view.c:2311 ../src/calendar/gui/e-day-view.c:3104
 #: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%e. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2315
+#: ../src/calendar/gui/e-calendar-view.c:2322
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -6859,15 +6764,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:2319 ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-calendar-view.c:2324 ../src/calendar/gui/e-day-view.c:3088
 #: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../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:2322
+#: ../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:2331
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
@@ -6907,44 +6812,44 @@ msgstr "Lähde"
 #: ../src/calendar/gui/e-meeting-store.c:167
 #: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
 #: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3559
-#: ../src/modules/itip-formatter/itip-view.c:6301
+#: ../src/modules/itip-formatter/itip-view.c:3560
+#: ../src/modules/itip-formatter/itip-view.c:6332
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:614
+#: ../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:388
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:435
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
+#: ../src/calendar/gui/e-cal-model.c:1522 ../src/calendar/gui/e-cal-ops.c:186
 #: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating an event"
 msgstr "Luodaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
+#: ../src/calendar/gui/e-cal-model.c:1526 ../src/calendar/gui/e-cal-ops.c:190
 #: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a memo"
 msgstr "Luodaan muistilappu"
 
-#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-model.c:1530 ../src/calendar/gui/e-cal-ops.c:194
 #: ../src/calendar/gui/e-cal-ops.c:1375
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1907
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1909
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../src/calendar/gui/e-cal-model.c:1896
-#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-cal-model.c:1911
+#: ../src/calendar/gui/e-cal-model-tasks.c:1094
 #: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:174
 #: ../src/calendar/gui/e-meeting-store.c:184
@@ -6952,30 +6857,30 @@ msgstr "Annettu tehtäväksi"
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/calendar/gui/e-cal-model.c:1896
-#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-cal-model.c:1911
+#: ../src/calendar/gui/e-cal-model-tasks.c:1094
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:186
 msgid "No"
 msgstr "Ei"
 
-#: ../src/calendar/gui/e-cal-model.c:3800
+#: ../src/calendar/gui/e-cal-model.c:3815
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:194
 #: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6289
+#: ../src/modules/itip-formatter/itip-view.c:6320
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../src/calendar/gui/e-cal-model.c:3801
+#: ../src/calendar/gui/e-cal-model.c:3816
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:196
 #: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6295
+#: ../src/modules/itip-formatter/itip-view.c:6326
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../src/calendar/gui/e-cal-model.c:3802
+#: ../src/calendar/gui/e-cal-model.c:3817
 #: ../src/calendar/gui/e-meeting-list-view.c:221
 #: ../src/calendar/gui/e-meeting-store.c:198
 #: ../src/calendar/gui/e-meeting-store.c:221
@@ -6983,21 +6888,21 @@ msgstr "Hylätty"
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/e-cal-model.c:3803
+#: ../src/calendar/gui/e-cal-model.c:3818
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6298
+#: ../src/modules/itip-formatter/itip-view.c:6329
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../src/calendar/gui/e-cal-model.c:3804
+#: ../src/calendar/gui/e-cal-model.c:3819
 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:3859
+#: ../src/calendar/gui/e-cal-model.c:3874
 #: ../src/calendar/gui/e-meeting-list-view.c:687
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7007,18 +6912,18 @@ msgstr "Vaatii toimenpiteitä"
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:148
+#: ../src/calendar/gui/e-cal-model-calendar.c:144
 #: ../src/calendar/gui/e-task-table.c:607
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:151
+#: ../src/calendar/gui/e-cal-model-calendar.c:147
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
 #: ../src/calendar/gui/e-task-table.c:608
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:496
+#: ../src/calendar/gui/e-cal-model-tasks.c:454
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7029,7 +6934,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:548
+#: ../src/calendar/gui/e-cal-model-tasks.c:506
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
@@ -7048,17 +6953,17 @@ msgstr "Nimi puuttuu."
 msgid "Modifying a task"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1918
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1946
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1922
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1950
 #, 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:1926
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1954
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
@@ -7254,204 +7159,208 @@ msgstr ""
 "Päiväys täytyy antaa seuraavassa muodossa: \n"
 "%s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:99
+#: ../src/calendar/gui/e-comp-editor-event.c:100
 msgid "Event’s time is in the past"
 msgstr "Tapahtuman ajankohta on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:200
+#: ../src/calendar/gui/e-comp-editor-event.c:206
 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:202
+#: ../src/calendar/gui/e-comp-editor-event.c:208
 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:204
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 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:436
-#: ../src/calendar/gui/e-comp-editor-task.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:442
+#: ../src/calendar/gui/e-comp-editor-task.c:541
 msgid "Start date is not a valid date"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:438
+#: ../src/calendar/gui/e-comp-editor-event.c:444
 msgid "Start time is not a valid time"
 msgstr "Alkamisaika on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:442
-#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../src/calendar/gui/e-comp-editor-event.c:448
+#: ../src/calendar/gui/e-comp-editor-event.c:464
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../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:4136
 #: ../src/e-util/e-misc-utils.c:4148 ../src/e-util/e-misc-utils.c:4162
-#: ../src/mail/e-mail-display.c:2191 ../src/mail/e-mail-reader-utils.c:806
-#: ../src/mail/mail-send-recv.c:569 ../src/mail/mail-send-recv.c:1422
+#: ../src/mail/e-mail-autoconfig.c:976 ../src/mail/e-mail-display.c:2256
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3754
+#: ../src/mail/em-composer-utils.c:3785 ../src/mail/mail-send-recv.c:568
+#: ../src/mail/mail-send-recv.c:1398
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
-#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
-#: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
+#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1221
+#: ../src/shell/e-shell.c:1245 ../src/smime/gui/certificate-manager.c:357
+#, c-format
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:452
+#: ../src/calendar/gui/e-comp-editor-event.c:458
 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:454
+#: ../src/calendar/gui/e-comp-editor-event.c:460
 msgid "End time is not a valid time"
 msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:584
-#: ../src/calendar/gui/e-comp-editor-memo.c:126
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:590
+#: ../src/calendar/gui/e-comp-editor-memo.c:134
+#: ../src/calendar/gui/e-comp-editor-task.c:646
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:586
-#: ../src/calendar/gui/e-comp-editor-memo.c:128
-#: ../src/calendar/gui/e-comp-editor-task.c:593
+#: ../src/calendar/gui/e-comp-editor-event.c:592
+#: ../src/calendar/gui/e-comp-editor-memo.c:136
+#: ../src/calendar/gui/e-comp-editor-task.c:648
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:592
-#: ../src/calendar/gui/e-comp-editor-task.c:599
+#: ../src/calendar/gui/e-comp-editor-event.c:598
+#: ../src/calendar/gui/e-comp-editor-task.c:654
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:594
-#: ../src/calendar/gui/e-comp-editor-task.c:601
+#: ../src/calendar/gui/e-comp-editor-event.c:600
+#: ../src/calendar/gui/e-comp-editor-task.c:656
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:600
+#: ../src/calendar/gui/e-comp-editor-event.c:606
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:602
+#: ../src/calendar/gui/e-comp-editor-event.c:608
 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:608
+#: ../src/calendar/gui/e-comp-editor-event.c:614
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:610
+#: ../src/calendar/gui/e-comp-editor-event.c:616
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:619
+#: ../src/calendar/gui/e-comp-editor-event.c:625
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:621
+#: ../src/calendar/gui/e-comp-editor-event.c:627
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:626
+#: ../src/calendar/gui/e-comp-editor-event.c:632
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:628
+#: ../src/calendar/gui/e-comp-editor-event.c:634
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:633
+#: ../src/calendar/gui/e-comp-editor-event.c:639
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:635
+#: ../src/calendar/gui/e-comp-editor-event.c:641
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:736
+#: ../src/calendar/gui/e-comp-editor-event.c:742
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:741
+#: ../src/calendar/gui/e-comp-editor-event.c:747
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:751
+#: ../src/calendar/gui/e-comp-editor-event.c:757
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:804
-#: ../src/calendar/gui/e-comp-editor-memo.c:213
-#: ../src/calendar/gui/e-comp-editor-task.c:765
+#: ../src/calendar/gui/e-comp-editor-event.c:811
+#: ../src/calendar/gui/e-comp-editor-memo.c:222
+#: ../src/calendar/gui/e-comp-editor-task.c:821
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:807
-#: ../src/calendar/gui/e-comp-editor-task.c:782
+#: ../src/calendar/gui/e-comp-editor-event.c:814
+#: ../src/calendar/gui/e-comp-editor-task.c:838
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:810
+#: ../src/calendar/gui/e-comp-editor-event.c:817
+#: ../src/calendar/gui/e-comp-editor-task.c:842
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:813
-#: ../src/calendar/gui/e-comp-editor-memo.c:216
-#: ../src/calendar/gui/e-comp-editor-task.c:785
+#: ../src/calendar/gui/e-comp-editor-event.c:820
+#: ../src/calendar/gui/e-comp-editor-memo.c:225
+#: ../src/calendar/gui/e-comp-editor-task.c:846
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:823
+#: ../src/calendar/gui/e-comp-editor-event.c:830
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-event.c:855
+#: ../src/calendar/gui/e-comp-editor-event.c:862
 #, c-format
 msgid "Meeting — %s"
 msgstr "Kokous — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:856
+#: ../src/calendar/gui/e-comp-editor-event.c:863
 #, c-format
 msgid "Appointment — %s"
 msgstr "Tapaaminen — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#: ../src/calendar/gui/e-comp-editor-memo.c:96
 #, fuzzy
 #| msgid "Memo cannot be edited, because the selected memo list is read only"
 msgid "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain lukutilassa"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:90
+#: ../src/calendar/gui/e-comp-editor-memo.c:98
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain lukutilassa"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:92
+#: ../src/calendar/gui/e-comp-editor-memo.c:100
 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:188
-#: ../src/calendar/gui/e-comp-editor-task.c:700
+#: ../src/calendar/gui/e-comp-editor-memo.c:196
+#: ../src/calendar/gui/e-comp-editor-task.c:755
 msgid "_List:"
 msgstr "_Luettelo:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:195
-#: ../src/calendar/gui/e-comp-editor-task.c:707
+#: ../src/calendar/gui/e-comp-editor-memo.c:203
+#: ../src/calendar/gui/e-comp-editor-task.c:762
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:247
+#: ../src/calendar/gui/e-comp-editor-memo.c:256
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Memo — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:248
+#: ../src/calendar/gui/e-comp-editor-memo.c:257
 #, fuzzy, c-format
 #| msgid "Memo - %s"
 msgid "Memo — %s"
@@ -7459,7 +7368,7 @@ msgstr "Muistilappu - %s"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/em-format/e-mail-formatter-attachment.c:334
 #: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
 #: ../src/e-util/e-attachment-paned.c:175 ../src/e-util/e-attachment-paned.c:180
 #: ../src/mail/message-list.etspec.h:4
@@ -7469,14 +7378,13 @@ msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
-#: ../src/e-util/e-attachment.c:2442
+#: ../src/e-util/e-attachment.c:2469
 #, c-format
-#| msgid "Could not load '%s'"
 msgid "Could not load “%s”"
 msgstr "Ei voitu ladata “%s”"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
-#: ../src/e-util/e-attachment.c:2445
+#: ../src/e-util/e-attachment.c:2472
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
@@ -7531,19 +7439,19 @@ msgstr "Kuvakenäkymä"
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:311
+#: ../src/calendar/gui/e-comp-editor-page-general.c:315
 #, 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:318
+#: ../src/calendar/gui/e-comp-editor-page-general.c:322
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:348
+#: ../src/calendar/gui/e-comp-editor-page-general.c:352
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -7551,72 +7459,101 @@ 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:434
+#: ../src/calendar/gui/e-comp-editor-page-general.c:438
 #, 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:584
+#: ../src/calendar/gui/e-comp-editor-page-general.c:599
 msgid "A_ttendees"
 msgstr "_Osanottajat"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:586
+#: ../src/calendar/gui/e-comp-editor-page-general.c:601
 #, 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:595
+#: ../src/calendar/gui/e-comp-editor-page-general.c:610
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:597
+#: ../src/calendar/gui/e-comp-editor-page-general.c:612
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:603
+#: ../src/calendar/gui/e-comp-editor-page-general.c:618
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:605
+#: ../src/calendar/gui/e-comp-editor-page-general.c:620
 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:611
+#: ../src/calendar/gui/e-comp-editor-page-general.c:626
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:613
+#: ../src/calendar/gui/e-comp-editor-page-general.c:628
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:619
+#: ../src/calendar/gui/e-comp-editor-page-general.c:634
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:621
+#: ../src/calendar/gui/e-comp-editor-page-general.c:636
 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:947
+#: ../src/calendar/gui/e-comp-editor-page-general.c:981
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:957
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1088
+#: ../src/calendar/gui/e-comp-editor-page-general.c:991
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1122
 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:1211
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1246
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1290
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1348
+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:1350
+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:1352
+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:1364
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1441
+#: ../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:1742
+#: ../src/e-util/e-html-editor-actions.c:922
+#: ../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:1026 ../src/mail/mail-config.ui.h:66
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
+#: ../src/plugins/email-custom-header/email-custom-header.c:842
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:467 ../src/shell/e-shell-window-actions.c:957
+#: ../src/smime/gui/smime-ui.ui.h:11
+msgid "_Edit"
+msgstr "_Muokkaa"
+
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
 msgid "Add exception"
 msgstr "Lisää poikkeus"
@@ -7795,7 +7732,7 @@ 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:2014
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2023
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Tämä tapaaminen _toistuu"
@@ -7845,74 +7782,74 @@ 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:2046
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
 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:2081
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
 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:2083
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
 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:2085
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
 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:2087
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
 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:2116
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
 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:2118
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
 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:2120
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
 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:2149
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2158
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1765
+#: ../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:65
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
 #: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -7932,30 +7869,30 @@ msgstr "_Muistutukset"
 msgid "Set or unset reminders"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1639
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
+#: ../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:1670
+#: ../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:1677
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1686
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -7963,31 +7900,31 @@ 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:1685
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
+#: ../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:1689
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1698
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 tunti ennen"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1700
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 päivä ennen"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1712
 #, fuzzy
 #| msgid "Custom"
 msgctxt "cal-reminders"
@@ -7995,7 +7932,7 @@ msgid "Custom"
 msgstr "Omavalintainen"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
 #, fuzzy
 #| msgid "minute(s)"
 msgctxt "cal-reminders"
@@ -8003,7 +7940,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:1848
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
 #, fuzzy
 #| msgid "hour(s)"
 msgctxt "cal-reminders"
@@ -8011,7 +7948,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:1850
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "cal-reminders"
@@ -8019,7 +7956,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:1867
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1876
 #, fuzzy
 #| msgid "before"
 msgctxt "cal-reminders"
@@ -8027,7 +7964,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:1869
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
 #, fuzzy
 #| msgid "after"
 msgctxt "cal-reminders"
@@ -8035,7 +7972,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:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
 #, fuzzy
 #| msgid "Start"
 msgctxt "cal-reminders"
@@ -8043,7 +7980,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:1887
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1896
 #, fuzzy
 #| msgid "_Send"
 msgctxt "cal-reminders"
@@ -8051,14 +7988,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:1906
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1915
 #, 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:1931
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1940
 #, fuzzy
 #| msgid "extra times every"
 msgctxt "cal-reminders"
@@ -8066,48 +8003,48 @@ 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:1968
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1977
 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:1970
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
 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:1972
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1981
 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:2009
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2175
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2062
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Oma _hälytysääni muistutukselles"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2073
 msgid "Select a sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2126
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2158
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
@@ -8124,8 +8061,6 @@ msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
 #: ../src/calendar/gui/e-comp-editor-property-parts.c:79
-#, fuzzy
-#| msgid "_Summary:"
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Yhteenveto:"
@@ -8153,170 +8088,180 @@ msgid "_Web page:"
 msgstr "_Verkkosivusto:"
 
 #: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
-#, fuzzy
-#| msgid "D_ue date:"
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1118
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1148
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1164
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1165
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1136
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1166
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1152
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1201
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1202
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1174
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1204
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1183
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1243
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1244
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1245
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1216
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1246
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1225
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1255
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1279
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1309
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1360
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1390
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1515
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:224
+#. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1642
+#, fuzzy
+#| msgid "None"
+msgctxt "ECompEditor"
+msgid "None"
+msgstr "Määrittelemätön"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:236
 #, 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:232
+#: ../src/calendar/gui/e-comp-editor-task.c:244
 #, 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:461
+#: ../src/calendar/gui/e-comp-editor-task.c:480
 #, 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:463
+#: ../src/calendar/gui/e-comp-editor-task.c:482
 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:465
+#: ../src/calendar/gui/e-comp-editor-task.c:484
 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:533
+#: ../src/calendar/gui/e-comp-editor-task.c:555
+msgid "Start date is required for recurring tasks"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-task.c:567
 #, 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:544
+#: ../src/calendar/gui/e-comp-editor-task.c:578
 #, 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:555
+#: ../src/calendar/gui/e-comp-editor-task.c:589
 #, 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:607
+#: ../src/calendar/gui/e-comp-editor-task.c:662
 #, fuzzy
 #| msgid "All _Day Event"
 msgid "All _Day Task"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:609
+#: ../src/calendar/gui/e-comp-editor-task.c:664
 #, 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:818
+#: ../src/calendar/gui/e-comp-editor-task.c:879
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:819
+#: ../src/calendar/gui/e-comp-editor-task.c:880
 #, fuzzy, c-format
 #| msgid "Task - %s"
 msgid "Task — %s"
@@ -8327,32 +8272,32 @@ msgstr "Tehtävä - %s"
 msgid "attachment"
 msgstr "liite"
 
-#: ../src/calendar/gui/e-comp-editor.c:608
+#: ../src/calendar/gui/e-comp-editor.c:607
 #, fuzzy
 #| msgid "Send _updates to attendees"
 msgid "Sending notifications to attendees..."
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../src/calendar/gui/e-comp-editor.c:997
+#: ../src/calendar/gui/e-comp-editor.c:996
 msgid "Saving changes..."
 msgstr "Tallennetaan muutoksia..."
 
-#: ../src/calendar/gui/e-comp-editor.c:1257
+#: ../src/calendar/gui/e-comp-editor.c:1256
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
 #: ../src/calendar/gui/e-comp-editor.c:1984 ../src/composer/e-composer-actions.c:329
-#: ../src/e-util/e-accounts-window.c:1730 ../src/e-util/e-html-editor-dialog.c:194
+#: ../src/e-util/e-accounts-window.c:1775 ../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:128
-#: ../src/mail/e-mail-notes.c:931 ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1737
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:131
+#: ../src/mail/e-mail-notes.c:952 ../src/mail/em-folder-properties.c:1151
+#: ../src/mail/em-subscription-editor.c:1739
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
 #: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:817
+#: ../src/shell/e-shell-window-actions.c:801
 #: ../src/smime/gui/certificate-manager.c:2212
 msgid "_Close"
 msgstr "_Sulje"
@@ -8363,37 +8308,37 @@ msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
 #: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:135
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2075
+#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:138
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:822
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #: ../src/calendar/gui/e-comp-editor.c:1993 ../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:411
-#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:137
-#: ../src/shell/e-shell-window-actions.c:840
+#: ../src/e-util/e-web-view.c:2010 ../src/mail/e-mail-browser.c:140
+#: ../src/shell/e-shell-window-actions.c:824
 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/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2061
+#: ../src/mail/e-mail-browser.c:145 ../src/shell/e-shell-window-actions.c:829
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
 #: ../src/calendar/gui/e-comp-editor.c:2000 ../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:2012
-#: ../src/mail/e-mail-browser.c:144 ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2019
+#: ../src/mail/e-mail-browser.c:147 ../src/shell/e-shell-window-actions.c:831
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
 #: ../src/calendar/gui/e-comp-editor.c:2007 ../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:854
+#: ../src/shell/e-shell-window-actions.c:838
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
@@ -8403,42 +8348,42 @@ msgstr "Näytä ohje"
 
 #. paste menu item
 #: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2087
+#: ../src/mail/e-mail-browser.c:152 ../src/shell/e-shell-window-actions.c:857
 msgid "_Paste"
 msgstr "_Liitä"
 
 #: ../src/calendar/gui/e-comp-editor.c:2021 ../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:2021
-#: ../src/mail/e-mail-browser.c:151 ../src/shell/e-shell-window-actions.c:875
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2028
+#: ../src/mail/e-mail-browser.c:154 ../src/shell/e-shell-window-actions.c:859
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
 #: ../src/calendar/gui/e-comp-editor.c:2026 ../src/composer/e-composer-actions.c:383
-#: ../src/mail/e-mail-reader.c:2402
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
+#: ../src/mail/e-mail-reader.c:2704
+#: ../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..."
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2409
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:813
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1014
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2711
+#: ../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/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
 #: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419
-#: ../src/mail/e-mail-browser.c:156 ../src/shell/e-shell-window-actions.c:950
+#: ../src/mail/e-mail-browser.c:159 ../src/shell/e-shell-window-actions.c:927
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
 #: ../src/calendar/gui/e-comp-editor.c:2042 ../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:158 ../src/shell/e-shell-window-actions.c:952
+#: ../src/mail/e-mail-browser.c:161 ../src/shell/e-shell-window-actions.c:929
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
@@ -8447,8 +8392,8 @@ msgid "_Classification"
 msgstr "Lu_okittelu"
 
 #: ../src/calendar/gui/e-comp-editor.c:2077 ../src/e-util/e-html-editor-actions.c:929
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:165
-#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:168
+#: ../src/mail/e-mail-notes.c:966 ../src/shell/e-shell-window-actions.c:964
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -8461,7 +8406,7 @@ msgid "_Options"
 msgstr "_Asetukset"
 
 #: ../src/calendar/gui/e-comp-editor.c:2105 ../src/e-util/e-html-editor-actions.c:971
-#: ../src/mail/e-mail-browser.c:179 ../src/shell/e-shell-window-actions.c:1030
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:1007
 #: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
@@ -8471,7 +8416,7 @@ msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
 #: ../src/calendar/gui/e-comp-editor.c:2122
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:961
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
@@ -8538,7 +8483,7 @@ msgid "None"
 msgstr "Ei mitään"
 
 #: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:322
+#: ../src/calendar/gui/e-timezone-entry.c:333
 #: ../src/modules/calendar/e-calendar-preferences.c:396
 msgid "Select..."
 msgstr "Valitse..."
@@ -8628,9 +8573,9 @@ msgstr "Osallistuja                          "
 #: ../src/calendar/gui/e-meeting-list-view.c:644
 #: ../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:1407
+#: ../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:1696
+#: ../src/e-util/e-collection-account-wizard.c:1719
 #: ../src/e-util/e-webdav-browser.c:2381 ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
@@ -8727,7 +8672,7 @@ msgstr "_Alkamisaika:"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2667
+#: ../src/calendar/gui/e-meeting-time-sel.c:2576
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -8736,7 +8681,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2669 ../src/calendar/gui/print.c:3520
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3525
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -8792,7 +8737,7 @@ msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
 #: ../src/calendar/gui/e-memo-table.c:763
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:574
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
@@ -8831,7 +8776,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
 #: ../src/calendar/gui/e-task-table.c:1114
-#: ../src/modules/calendar/e-task-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:700
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
@@ -8851,7 +8796,7 @@ msgstr "Aloituspäivä"
 msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:1088
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:1064
 msgid "Complete"
 msgstr "Valmis"
 
@@ -8870,23 +8815,23 @@ msgstr "% valmiina"
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: ../src/calendar/gui/e-timezone-entry.c:333
+#: ../src/calendar/gui/e-timezone-entry.c:344
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. Translators: It will display "Start: StartDateAndTime"
 #: ../src/calendar/gui/e-to-do-pane.c:370
-#, fuzzy, c-format
+#, c-format
 #| msgid "Start: "
 msgid "Start: %s"
-msgstr "Alkaa: "
+msgstr "Alkaa: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
 #: ../src/calendar/gui/e-to-do-pane.c:390
-#, fuzzy, c-format
+#, c-format
 #| msgid "Due: "
 msgid "Due: %s"
-msgstr "Erääntyy: "
+msgstr "Erääntyy: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
 #: ../src/calendar/gui/e-to-do-pane.c:404
@@ -8896,74 +8841,73 @@ msgid "Completed: %s"
 msgstr "Valmis "
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1424 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1452 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:206
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
-#: ../src/modules/itip-formatter/itip-view.c:254
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
+#: ../src/modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1426 ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:282
+#: ../src/calendar/gui/e-to-do-pane.c:1454 ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1436
+#: ../src/calendar/gui/e-to-do-pane.c:1464
 #, fuzzy
 #| msgid "With _Due Date"
 msgid "Tasks without Due date"
 msgstr "_Eräpäivän kanssa"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2009
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../src/calendar/gui/e-to-do-pane.c:2037
+#: ../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:2017
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../src/calendar/gui/e-to-do-pane.c:2045
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2025
+#: ../src/calendar/gui/e-to-do-pane.c:2053
 #, fuzzy
 #| msgid "New _Task"
 msgid "New _Task..."
 msgstr "Uusi _tehtävä"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2033
+#: ../src/calendar/gui/e-to-do-pane.c:2061
 #, fuzzy
 #| msgctxt "New"
 #| msgid "Assigne_d Task"
 msgid "_New Assigned Task..."
 msgstr "Tehtäväksi_anto"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2046
-#| msgid "_Open"
+#: ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2060
+#: ../src/calendar/gui/e-to-do-pane.c:2088
 #, fuzzy
 #| msgid "Delete This _Occurrence"
 msgid "_Delete This Instance..."
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2068
+#: ../src/calendar/gui/e-to-do-pane.c:2096
 #, fuzzy
 #| msgid "All Instances"
 msgid "D_elete All Instances..."
 msgstr "Kaikki kerrat"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2076
+#: ../src/calendar/gui/e-to-do-pane.c:2104
 msgid "_Delete..."
 msgstr "_Poista..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2093
+#: ../src/calendar/gui/e-to-do-pane.c:2121
 msgid "_Show Tasks without Due date"
-msgstr ""
+msgstr "_Näytä tehtävät ilman eräpäivää"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2379
+#: ../src/calendar/gui/e-to-do-pane.c:2387
 #, fuzzy
 #| msgid "_To Do"
 msgid "To Do"
@@ -9156,78 +9100,78 @@ msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3313
+#: ../src/calendar/gui/print.c:3318
 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:3323
+#: ../src/calendar/gui/print.c:3328
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3329
+#: ../src/calendar/gui/print.c:3334
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3339
+#: ../src/calendar/gui/print.c:3344
 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:3346
+#: ../src/calendar/gui/print.c:3351
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../src/calendar/gui/print.c:3490
+#: ../src/calendar/gui/print.c:3495
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3497 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/gui/print.c:3494
+#: ../src/calendar/gui/print.c:3499
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/gui/print.c:3550
+#: ../src/calendar/gui/print.c:3555
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../src/calendar/gui/print.c:3594
+#: ../src/calendar/gui/print.c:3599
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../src/calendar/gui/print.c:3610
+#: ../src/calendar/gui/print.c:3615
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../src/calendar/gui/print.c:3628
+#: ../src/calendar/gui/print.c:3633
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3647
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3661
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../src/calendar/gui/print.c:3667
+#: ../src/calendar/gui/print.c:3672
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -9256,16 +9200,16 @@ msgstr "Tapaamiset ja kokoukset"
 
 #: ../src/calendar/importers/icalendar-importer.c:306
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:76
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
+#: ../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-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
 #: ../src/calendar/importers/icalendar-importer.c:309
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
-#: ../src/modules/calendar/e-task-shell-view-actions.c:202
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:330
+#: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
@@ -9277,184 +9221,185 @@ msgstr "_Luo uusi kalenteri"
 msgid "Cre_ate new task list"
 msgstr "Luo _uusi tehtävälista"
 
-#: ../src/calendar/importers/icalendar-importer.c:501
-#: ../src/calendar/importers/icalendar-importer.c:940
+#: ../src/calendar/importers/icalendar-importer.c:500
+#: ../src/calendar/importers/icalendar-importer.c:939
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../src/calendar/importers/icalendar-importer.c:648
+#: ../src/calendar/importers/icalendar-importer.c:647
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:649
+#: ../src/calendar/importers/icalendar-importer.c:648
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:741
+#: ../src/calendar/importers/icalendar-importer.c:740
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../src/calendar/importers/icalendar-importer.c:826
+#: ../src/calendar/importers/icalendar-importer.c:825
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:827
+#: ../src/calendar/importers/icalendar-importer.c:826
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1103
+#: ../src/calendar/importers/icalendar-importer.c:1102
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1146
+#: ../src/calendar/importers/icalendar-importer.c:1145
 msgid "GNOME Calendar"
 msgstr "Gnomen kalenteri"
 
-#: ../src/calendar/importers/icalendar-importer.c:1147
+#: ../src/calendar/importers/icalendar-importer.c:1146
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1218
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1217
+#: ../src/calendar/importers/icalendar-importer.c:1531
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../src/calendar/importers/icalendar-importer.c:1218
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1217
+#: ../src/calendar/importers/icalendar-importer.c:1531
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/calendar/importers/icalendar-importer.c:1221
-#: ../src/calendar/importers/icalendar-importer.c:1533
+#: ../src/calendar/importers/icalendar-importer.c:1220
+#: ../src/calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/importers/icalendar-importer.c:1224
-#: ../src/calendar/importers/icalendar-importer.c:1534
+#: ../src/calendar/importers/icalendar-importer.c:1223
+#: ../src/calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/importers/icalendar-importer.c:1233
+#. have ? NULL :
+#: ../src/calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1238
+#: ../src/calendar/importers/icalendar-importer.c:1237
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../src/calendar/importers/icalendar-importer.c:1243
+#: ../src/calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../src/calendar/importers/icalendar-importer.c:1248
+#: ../src/calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1261
+#: ../src/calendar/importers/icalendar-importer.c:1260
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1264
+#: ../src/calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1267
+#: ../src/calendar/importers/icalendar-importer.c:1266
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1271
+#: ../src/calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1276
-#: ../src/calendar/importers/icalendar-importer.c:1576
+#: ../src/calendar/importers/icalendar-importer.c:1275
+#: ../src/calendar/importers/icalendar-importer.c:1575
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1282
+#: ../src/calendar/importers/icalendar-importer.c:1281
 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:1290
-#: ../src/calendar/importers/icalendar-importer.c:1571
+#: ../src/calendar/importers/icalendar-importer.c:1289
+#: ../src/calendar/importers/icalendar-importer.c:1570
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1301
+#: ../src/calendar/importers/icalendar-importer.c:1300
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1313
+#: ../src/calendar/importers/icalendar-importer.c:1312
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1323
+#: ../src/calendar/importers/icalendar-importer.c:1322
 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:1347
+#: ../src/calendar/importers/icalendar-importer.c:1346
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1355
+#: ../src/calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1366
-#: ../src/calendar/importers/icalendar-importer.c:1369
+#: ../src/calendar/importers/icalendar-importer.c:1365
+#: ../src/calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1389
-#: ../src/calendar/importers/icalendar-importer.c:1392
+#: ../src/calendar/importers/icalendar-importer.c:1388
+#: ../src/calendar/importers/icalendar-importer.c:1391
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../src/calendar/importers/icalendar-importer.c:1406
+#: ../src/calendar/importers/icalendar-importer.c:1405
 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:1566
+#: ../src/calendar/importers/icalendar-importer.c:1565
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -11022,12 +10967,12 @@ msgstr "Uusi _viesti"
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1302
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1453
+#: ../src/shell/e-shell-window-actions.c:871
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/composer/e-composer-actions.c:345 ../src/shell/e-shell-window-actions.c:889
+#: ../src/composer/e-composer-actions.c:345 ../src/shell/e-shell-window-actions.c:873
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
@@ -11172,7 +11117,7 @@ msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1728
+#: ../src/e-util/e-collection-account-wizard.c:1751
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
 #: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
@@ -11239,25 +11184,25 @@ msgstr "Avaa osoitekirja tästä"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../src/composer/e-msg-composer.c:861
+#: ../src/composer/e-msg-composer.c:998
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole asetettu "
 "tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:870
+#: ../src/composer/e-msg-composer.c:1007
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:1639 ../src/composer/e-msg-composer.c:2311
+#: ../src/composer/e-msg-composer.c:1797 ../src/composer/e-msg-composer.c:2471
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../src/composer/e-msg-composer.c:4696
+#: ../src/composer/e-msg-composer.c:4903
 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)"
@@ -11538,10 +11483,16 @@ msgstr "Jokin meni pieleen viestiä muokatessa"
 msgid ""
 "A WebKitWebProcess crashed when editing the message. You can try again by closing "
 "the composer window and opening a new one. If the issue persists, please file a "
-"bug report in the GNOME bugzilla."
+"bug report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/composer/mail-composer.error.xml.h:58
+#, fuzzy
+#| msgid "An error occurred while printing"
+msgid "An error occurred while creating message composer."
+msgstr "Tapahtui virhe tulostettaessa"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:335
 msgid "Display as attachment"
 msgstr "Näytä liitteenä"
 
@@ -11554,7 +11505,7 @@ 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-part-headers.c:46 ../src/mail/e-mail-tag-editor.c:203
+#: ../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ä"
@@ -11604,7 +11555,7 @@ msgid "Size"
 msgstr "Koko"
 
 #: ../src/em-format/e-mail-formatter-quote-headers.c:178
-#: ../src/em-format/e-mail-part-headers.c:51 ../src/mail/e-mail-tag-editor.c:208
+#: ../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
 #: ../src/modules/mail/em-mailer-prefs.c:65
@@ -11614,8 +11565,10 @@ msgstr "Aihe"
 
 #. pseudo-header
 #: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1500
+#: ../src/em-format/e-mail-formatter-utils.c:346
+#: ../src/modules/mail/em-mailer-prefs.c:686
+#: ../src/modules/mail/em-mailer-prefs.c:1619
+#: ../src/modules/mail/em-mailer-prefs.c:1668
 msgid "Mailer"
 msgstr "Postittaja"
 
@@ -11777,44 +11730,60 @@ msgstr ""
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../src/em-format/e-mail-formatter-utils.c:200
-#: ../src/em-format/e-mail-formatter-utils.c:217
+#: ../src/em-format/e-mail-formatter-utils.c:205
+#: ../src/em-format/e-mail-formatter-utils.c:222
 #: ../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:201
-#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-formatter-utils.c:206
+#: ../src/em-format/e-mail-formatter-utils.c:223
 #: ../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:202
-#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-formatter-utils.c:207
+#: ../src/em-format/e-mail-formatter-utils.c:224
 #: ../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:582
+#: ../src/em-format/e-mail-formatter-utils.c:562
 msgid "GPG signed"
 msgstr "GPG-allekirjoitettu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:588
+#: ../src/em-format/e-mail-formatter-utils.c:562
+msgid "partially GPG signed"
+msgstr "osittain GPG-allekirjoitettu"
+
+#: ../src/em-format/e-mail-formatter-utils.c:563
 msgid "GPG encrypted"
 msgstr "GPG-salattu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:594
+#: ../src/em-format/e-mail-formatter-utils.c:563
+msgid "partially GPG encrypted"
+msgstr "osittain GPG-salattu"
+
+#: ../src/em-format/e-mail-formatter-utils.c:564
 msgid "S/MIME signed"
 msgstr "S/MIME-allekirjoitettu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:600
+#: ../src/em-format/e-mail-formatter-utils.c:564
+msgid "partially S/MIME signed"
+msgstr "osittain S/MIME-allekirjoitettu"
+
+#: ../src/em-format/e-mail-formatter-utils.c:565
 msgid "S/MIME encrypted"
 msgstr "S/MIME-salattu"
 
-#: ../src/em-format/e-mail-formatter-utils.c:609
-#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/em-format/e-mail-formatter-utils.c:565
+msgid "partially S/MIME encrypted"
+msgstr "osittain S/MIME-salattu"
+
+#: ../src/em-format/e-mail-formatter-utils.c:678
+#: ../src/mail/e-mail-config-security-page.c:856
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
 msgid "Security"
@@ -11825,18 +11794,18 @@ msgstr "Turvallisuus"
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../src/em-format/e-mail-parser-application-smime.c:81
+#: ../src/em-format/e-mail-parser-application-smime.c:101
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "S/MIME-viestin jäsennys epäonnistui: %s"
 
-#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:76
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "PGP-viestin jäsennys epäonnistui: %s"
 
-#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
-#: ../src/em-format/e-mail-parser-multipart-signed.c:133
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
+#: ../src/em-format/e-mail-parser-multipart-signed.c:152
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Virhe vahvistaessa allekirjoitusta: %s"
@@ -11874,21 +11843,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:64
-#: ../src/em-format/e-mail-parser-multipart-signed.c:81
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:65
+#: ../src/em-format/e-mail-parser-multipart-signed.c:100
 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:79
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:80
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:99
 #, 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:119
+#: ../src/em-format/e-mail-parser-multipart-signed.c:138
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
@@ -11947,81 +11916,97 @@ msgstr "Kalenteri väliltä %s - %s"
 msgid "evolution calendar item"
 msgstr "evolutionin kalenterin kohta"
 
-#: ../src/e-util/e-accounts-window.c:523 ../src/e-util/e-accounts-window.c:640
-#: ../src/e-util/e-accounts-window.c:860
-#: ../src/modules/mail/e-mail-shell-backend.c:852
+#: ../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:853
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../src/e-util/e-accounts-window.c:530 ../src/e-util/e-accounts-window.c:669
-#: ../src/e-util/e-accounts-window.c:874
+#: ../src/e-util/e-accounts-window.c:564 ../src/e-util/e-accounts-window.c:703
+#: ../src/e-util/e-accounts-window.c:908
 msgid "Address Books"
 msgstr "Osoitekirjat"
 
-#: ../src/e-util/e-accounts-window.c:536 ../src/e-util/e-accounts-window.c:670
-#: ../src/e-util/e-accounts-window.c:875
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
+#: ../src/e-util/e-accounts-window.c:909
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "Calendars"
 msgstr "Kalenterit"
 
-#: ../src/e-util/e-accounts-window.c:542 ../src/e-util/e-accounts-window.c:671
-#: ../src/e-util/e-accounts-window.c:876
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../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:86
 msgid "Memo Lists"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-accounts-window.c:548 ../src/e-util/e-accounts-window.c:672
-#: ../src/e-util/e-accounts-window.c:877
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+#: ../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:87
 msgid "Task Lists"
 msgstr "Tehtävälistat"
 
-#: ../src/e-util/e-accounts-window.c:1363 ../src/e-util/filter.ui.h:23
+#: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
 #: ../src/modules/mail/em-composer-prefs.c:1305
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
+#: ../src/plugins/mail-notification/mail-notification.c:1124
 #: ../src/plugins/publish-calendar/publish-calendar.c:854
 msgid "Enabled"
 msgstr "käytössä"
 
-#: ../src/e-util/e-accounts-window.c:1379 ../src/mail/e-mail-account-tree-view.c:108
+#: ../src/e-util/e-accounts-window.c:1415 ../src/mail/e-mail-account-tree-view.c:108
+#: ../src/plugins/mail-notification/mail-notification.c:1140
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: ../src/e-util/e-accounts-window.c:1446
+#: ../src/e-util/e-accounts-window.c:1482
 #, fuzzy
 #| msgid "Evolution Accounts"
 msgid "Collection _Account"
 msgstr "Evolution-tilit"
 
-#: ../src/e-util/e-accounts-window.c:1447
+#: ../src/e-util/e-accounts-window.c:1483
 msgid "_Mail Account"
 msgstr "S_ähköpostitili"
 
-#: ../src/e-util/e-accounts-window.c:1448
+#: ../src/e-util/e-accounts-window.c:1484
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../src/e-util/e-accounts-window.c:1449
+#: ../src/e-util/e-accounts-window.c:1485
 msgid "_Calendar"
 msgstr "_Kalenteri"
 
-#: ../src/e-util/e-accounts-window.c:1450
+#: ../src/e-util/e-accounts-window.c:1486
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "M_emo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-accounts-window.c:1451
+#: ../src/e-util/e-accounts-window.c:1487
 #, fuzzy
 #| msgid "Task List"
 msgid "_Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-accounts-window.c:1646
+#: ../src/e-util/e-accounts-window.c:1682
 msgid "Evolution Accounts"
 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:1758 ../src/e-util/e-webdav-browser.c:2699
+#: ../src/mail/em-subscription-editor.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1475
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1546
+msgid "_Refresh"
+msgstr "_Päivitä"
+
+#: ../src/e-util/e-accounts-window.c:1759
+msgid "Initiates refresh of account sources"
+msgstr ""
+
 #. Translators: This is a cancelled activity.
 #: ../src/e-util/e-activity.c:256
 #, c-format
@@ -12062,7 +12047,7 @@ 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:1849
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Cancel"
 msgstr "Peru"
 
@@ -12071,6 +12056,10 @@ msgstr "Peru"
 msgid "Close this message (Escape)"
 msgstr "Sulje tämä viesti (Escape)"
 
+#: ../src/e-util/e-alert-dialog.c:162
+msgid "_Dismiss"
+msgstr "_Hylkää"
+
 #: ../src/e-util/e-alert-sink.c:244
 #, fuzzy
 #| msgid "Failed to mark messages as read."
@@ -12085,44 +12074,44 @@ msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../src/e-util/e-attachment.c:2063 ../src/e-util/e-attachment.c:3116
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
 msgid "Operation was cancelled"
 msgstr "Toiminto peruttiin"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2247 ../src/e-util/e-attachment.c:2963
-#: ../src/e-util/e-attachment.c:3406 ../src/e-util/e-attachment-store.c:886
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
+#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:887
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../src/e-util/e-attachment.c:2325 ../src/e-util/e-attachment.c:3466
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../src/e-util/e-attachment.c:2333 ../src/e-util/e-attachment.c:3474
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
-#: ../src/e-util/e-attachment.c:2730
+#: ../src/e-util/e-attachment.c:2757
 #, c-format
 msgid "Could not open “%s”"
 msgstr "Ei voitu avata “%s”"
 
-#: ../src/e-util/e-attachment.c:2733
+#: ../src/e-util/e-attachment.c:2760
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../src/e-util/e-attachment.c:3483
+#: ../src/e-util/e-attachment.c:3519
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../src/e-util/e-attachment.c:3574
+#: ../src/e-util/e-attachment.c:3610
 #, c-format
 msgid "Could not save “%s”"
 msgstr "Ei voitu tallentaa “%s”"
 
-#: ../src/e-util/e-attachment.c:3577
+#: ../src/e-util/e-attachment.c:3613
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
@@ -12220,8 +12209,8 @@ msgstr "_Tallenna nimellä"
 
 #: ../src/e-util/e-attachment-view.c:332
 #: ../src/plugins/save-calendar/save-calendar.c:351
-#: ../src/plugins/save-calendar/save-calendar.c:382
-#: ../src/plugins/save-calendar/save-calendar.c:413
+#: ../src/plugins/save-calendar/save-calendar.c:390
+#: ../src/plugins/save-calendar/save-calendar.c:429
 msgid "Save _As"
 msgstr "Tallenna _nimellä"
 
@@ -12230,12 +12219,12 @@ msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
 #: ../src/e-util/e-attachment-view.c:349
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
-#: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
+#: ../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:1468
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1539
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
@@ -12403,7 +12392,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:2109
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2112
 msgid "?"
 msgstr "?"
 
@@ -12528,14 +12517,14 @@ msgstr ""
 
 #: ../src/e-util/e-collection-account-wizard.c:214
 msgid "Looking up details, please wait…"
-msgstr ""
+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:271
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter Google password for user '%s'."
 msgid "Requires password to continue. %s."
-msgstr "Anna käyttäjän '%s' Google-salasana."
+msgstr "Salasana vaaditaan jatkamiseksi. %s."
 
 #: ../src/e-util/e-collection-account-wizard.c:284
 msgid "View certificate"
@@ -12547,7 +12536,7 @@ msgstr "Näytä varmenne"
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
-msgstr ""
+msgstr "%s %s."
 
 #: ../src/e-util/e-collection-account-wizard.c:326
 msgid ""
@@ -12574,80 +12563,80 @@ msgstr "_Salasana:"
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../src/e-util/e-collection-account-wizard.c:555
+#: ../src/e-util/e-collection-account-wizard.c:577
 #: ../src/e-util/e-webdav-browser.c:473
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../src/e-util/e-collection-account-wizard.c:556
+#: ../src/e-util/e-collection-account-wizard.c:578
 #, fuzzy
 #| msgid "Mail Receipt"
 msgid "Mail Receive"
 msgstr "Sähköpostin vastaanotto"
 
-#: ../src/e-util/e-collection-account-wizard.c:557
+#: ../src/e-util/e-collection-account-wizard.c:579
 #, fuzzy
 #| msgid "Mailer"
 msgid "Mail Send"
 msgstr "Postittaja"
 
-#: ../src/e-util/e-collection-account-wizard.c:558
+#: ../src/e-util/e-collection-account-wizard.c:580
 #: ../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:560
+#: ../src/e-util/e-collection-account-wizard.c:582
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "Memo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-collection-account-wizard.c:561
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/e-util/e-collection-account-wizard.c:583
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-collection-account-wizard.c:896
+#: ../src/e-util/e-collection-account-wizard.c:919
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1193
+#: ../src/e-util/e-collection-account-wizard.c:1216
 msgid "Saving account settings, please wait…"
 msgstr "Tallennetaan tilin asetuksia, odota hetki…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1337
+#: ../src/e-util/e-collection-account-wizard.c:1360
 msgid "User details"
 msgstr "Käyttäjän tiedot"
 
-#: ../src/e-util/e-collection-account-wizard.c:1350
+#: ../src/e-util/e-collection-account-wizard.c:1373
 msgid "_Email Address or User name:"
 msgstr "S_ähköpostiosoite tai käyttäjätunnus:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1380
+#: ../src/e-util/e-collection-account-wizard.c:1403
 msgid "_Advanced Options"
 msgstr "_Lähetysasetukset"
 
-#: ../src/e-util/e-collection-account-wizard.c:1385
+#: ../src/e-util/e-collection-account-wizard.c:1408
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1403
+#: ../src/e-util/e-collection-account-wizard.c:1426
 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:1595
+#: ../src/e-util/e-collection-account-wizard.c:1618
 #, 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:1719
+#: ../src/e-util/e-collection-account-wizard.c:1742
 #: ../src/mail/e-mail-config-identity-page.c:541
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
@@ -12823,9 +12812,9 @@ msgstr ""
 msgid "white"
 msgstr "valkoinen"
 
-#: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:404
-#: ../src/mail/e-mail-config-security-page.c:568 ../src/mail/e-mail-reader.c:4138
+#: ../src/e-util/e-color-combo.c:641 ../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:4735
 #: ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Oletukset"
@@ -12873,7 +12862,7 @@ msgstr "_Ei mitään"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2125
+#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2131
 msgctxt "date"
 msgid "None"
 msgstr "Ei mitään"
@@ -13234,23 +13223,23 @@ msgstr "Valitse aika johon verrataan"
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-filter-rule.c:978
+#: ../src/e-util/e-filter-rule.c:979
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../src/e-util/e-filter-rule.c:1034
+#: ../src/e-util/e-filter-rule.c:1035
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../src/e-util/e-filter-rule.c:1035
+#: ../src/e-util/e-filter-rule.c:1036
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../src/e-util/e-filter-rule.c:1041
+#: ../src/e-util/e-filter-rule.c:1042
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../src/e-util/e-filter-rule.c:1064
+#: ../src/e-util/e-filter-rule.c:1065
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -13258,46 +13247,46 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1079 ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../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:658
+#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:741
 #: ../src/mail/e-mail-config-summary-page.c:141
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../src/e-util/e-filter-rule.c:1080
+#: ../src/e-util/e-filter-rule.c:1081
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../src/e-util/e-filter-rule.c:1081 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1082 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../src/e-util/e-filter-rule.c:1082
+#: ../src/e-util/e-filter-rule.c:1083
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../src/e-util/e-filter-rule.c:1083
+#: ../src/e-util/e-filter-rule.c:1084
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../src/e-util/e-filter-rule.c:1086
+#: ../src/e-util/e-filter-rule.c:1087
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../src/e-util/e-filter-rule.c:1164
+#: ../src/e-util/e-filter-rule.c:1165
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../src/e-util/e-filter-rule.c:1478 ../src/e-util/filter.ui.h:1
+#: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
 #: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../src/e-util/e-filter-rule.c:1478 ../src/mail/em-filter-rule.c:1044
+#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1044
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Lähtevät"
@@ -13346,7 +13335,7 @@ msgstr "Liitä teksti leikepöydältä"
 
 #: ../src/e-util/e-html-editor-actions.c:901
 msgid "Redo the last undone action"
-msgstr ""
+msgstr "Tee uudelleen viimeisin kumottu toiminto"
 
 #: ../src/e-util/e-html-editor-actions.c:915
 msgid "Undo the last action"
@@ -13802,19 +13791,19 @@ msgstr "_Viiva"
 msgid "_Table"
 msgstr "_Taulukko"
 
-#: ../src/e-util/e-html-editor.c:727
+#: ../src/e-util/e-html-editor.c:742
 msgid "Paragraph Style"
 msgstr "Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor.c:741
+#: ../src/e-util/e-html-editor.c:756
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../src/e-util/e-html-editor.c:753
+#: ../src/e-util/e-html-editor.c:768
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../src/e-util/e-html-editor.c:763
+#: ../src/e-util/e-html-editor.c:778
 msgid "Font Size"
 msgstr "Fontin koko"
 
@@ -14124,7 +14113,7 @@ 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:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "_Template:"
 msgstr "_Malli:"
 
@@ -14298,7 +14287,7 @@ msgstr "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyy
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../src/e-util/e-import-assistant.c:343 ../src/e-util/e-import-assistant.c:948
+#: ../src/e-util/e-import-assistant.c:343 ../src/e-util/e-import-assistant.c:956
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
@@ -14345,29 +14334,29 @@ msgstr "Ohjelmasta %s:"
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../src/e-util/e-import-assistant.c:947
+#: ../src/e-util/e-import-assistant.c:955
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../src/e-util/e-import-assistant.c:953 ../src/e-util/e-import-assistant.c:966
-#: ../src/e-util/e-import-assistant.c:1319 ../src/e-util/e-import-assistant.c:1395
-#: ../src/e-util/e-import-assistant.c:1404
+#: ../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
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../src/e-util/e-import-assistant.c:961
+#: ../src/e-util/e-import-assistant.c:969
 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:1309 ../src/e-util/e-import-assistant.c:1344
+#: ../src/e-util/e-import-assistant.c:1317 ../src/e-util/e-import-assistant.c:1352
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../src/e-util/e-import-assistant.c:1326 ../src/e-util/e-import-assistant.c:1382
+#: ../src/e-util/e-import-assistant.c:1334 ../src/e-util/e-import-assistant.c:1390
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../src/e-util/e-import-assistant.c:1337
+#: ../src/e-util/e-import-assistant.c:1345
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external "
@@ -14377,33 +14366,50 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista Evolutionin "
 "käyttöön."
 
-#: ../src/e-util/e-import-assistant.c:1354
+#: ../src/e-util/e-import-assistant.c:1362
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../src/e-util/e-import-assistant.c:1364
+#: ../src/e-util/e-import-assistant.c:1372
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../src/e-util/e-import-assistant.c:1373
+#: ../src/e-util/e-import-assistant.c:1381
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-import-assistant.c:1390
+#: ../src/e-util/e-import-assistant.c:1398
 #, fuzzy
 #| msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:580
+msgid "minutes"
+msgstr "minuutti"
+
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
+msgid "hours"
+msgstr "tuntia"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:344
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "days"
+msgstr "päivä"
+
 #: ../src/e-util/e-mail-signature-combo-box.c:431
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:954
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:959
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
@@ -14562,10 +14568,10 @@ msgstr "Et_si:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
 #: ../src/e-util/e-name-selector-dialog.c:1330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1187
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:758
-#: ../src/modules/calendar/e-task-shell-view-actions.c:931
+#: ../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
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -14583,25 +14589,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:3237
+#: ../src/e-util/e-name-selector-entry.c:3252
 #, fuzzy, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Laajenna kaikki"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3253
+#: ../src/e-util/e-name-selector-entry.c:3268
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3264
+#: ../src/e-util/e-name-selector-entry.c:3279
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3282
+#: ../src/e-util/e-name-selector-entry.c:3297
 #, c-format
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
@@ -14756,46 +14762,46 @@ msgstr "Muokkaa sääntöä"
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../src/e-util/e-search-bar.c:609
+#: ../src/e-util/e-search-bar.c:611
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../src/e-util/e-search-bar.c:617
+#: ../src/e-util/e-search-bar.c:619
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../src/e-util/e-search-bar.c:629
+#: ../src/e-util/e-search-bar.c:631
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../src/e-util/e-search-bar.c:653
+#: ../src/e-util/e-search-bar.c:655
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:73
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../src/e-util/e-search-bar.c:656
+#: ../src/e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../src/e-util/e-search-bar.c:665
+#: ../src/e-util/e-search-bar.c:667
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:80
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:224
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../src/e-util/e-search-bar.c:677
+#: ../src/e-util/e-search-bar.c:679
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../src/e-util/e-search-bar.c:705
+#: ../src/e-util/e-search-bar.c:707
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../src/e-util/e-search-bar.c:727
+#: ../src/e-util/e-search-bar.c:729
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
@@ -14948,59 +14954,59 @@ msgstr ""
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
+#: ../src/e-util/e-source-config.c:724 ../src/e-util/e-source-config.c:728
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
+#: ../src/e-util/e-source-config.c:738 ../src/e-util/e-source-config.c:742
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748
+#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1748
 msgid "Name cannot be empty"
 msgstr "Nimi ei voi olla tyhjä"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1359
+#: ../src/e-util/e-source-config.c:1416
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../src/e-util/e-source-config.c:1389 ../src/e-util/e-source-config.c:1459
+#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1516
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä:"
 
-#: ../src/e-util/e-source-config.c:1485
+#: ../src/e-util/e-source-config.c:1542
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1578
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../src/e-util/e-source-selector.c:3212
+#: ../src/e-util/e-source-selector.c:3217
 msgid "Show"
 msgstr "Näytä"
 
-#: ../src/e-util/e-source-selector.c:3219
+#: ../src/e-util/e-source-selector.c:3224
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:793
+#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:793
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../src/e-util/e-source-selector.c:3374 ../src/e-util/e-source-selector.c:3473
+#: ../src/e-util/e-source-selector.c:3379 ../src/e-util/e-source-selector.c:3478
 msgid "_Show"
 msgstr "_Näytä"
 
-#: ../src/e-util/e-source-selector.c:3426
+#: ../src/e-util/e-source-selector.c:3431
 msgid "Manage Groups"
 msgstr "Hallitse ryhmiä"
 
-#: ../src/e-util/e-source-selector.c:3438
+#: ../src/e-util/e-source-selector.c:3443
 msgid "Available Groups:"
 msgstr "Käytettävissä olevat ryhmät:"
 
@@ -15013,7 +15019,7 @@ msgid "Select destination"
 msgstr "Valitse kohde"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-spell-dictionary.c:264
+#: ../src/e-util/e-spell-dictionary.c:265
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -15021,7 +15027,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-spell-dictionary.c:279 ../src/e-util/e-spell-dictionary.c:284
+#: ../src/e-util/e-spell-dictionary.c:280 ../src/e-util/e-spell-dictionary.c:285
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -15174,8 +15180,8 @@ msgstr "Jokin meni pieleen"
 #: ../src/e-util/e-system.error.xml.h:24
 msgid ""
 "A WebKitWebProcess crashed when displaying the content. You can try again by "
-"reopening the window. If the issue persists, please file a bug report in the GNOME "
-"bugzilla."
+"reopening the window. If the issue persists, please file a bug report in GNOME "
+"Gitlab."
 msgstr ""
 
 #: ../src/e-util/e-system.error.xml.h:25
@@ -15193,6 +15199,10 @@ msgid ""
 msgstr ""
 "Etäkalenteri \"{0}\" poistetaan pysyvästi palvelimelta. Haluatko varmasti jatkaa?"
 
+#: ../src/e-util/e-system.error.xml.h:29
+msgid "Failed to refresh list of account sources"
+msgstr ""
+
 #: ../src/e-util/e-table-click-to-add.c:687
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
@@ -15261,11 +15271,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:1779
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1780
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1780
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -15356,68 +15366,68 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../src/e-util/e-table-header-item.c:1606
+#: ../src/e-util/e-table-header-item.c:1607
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../src/e-util/e-table-header-item.c:1629
+#: ../src/e-util/e-table-header-item.c:1630
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../src/e-util/e-table-header-item.c:1632
+#: ../src/e-util/e-table-header-item.c:1633
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../src/e-util/e-table-header-item.c:1635
+#: ../src/e-util/e-table-header-item.c:1636
 msgid "_Reset sort"
 msgstr "_Palauta järjestys"
 
-#: ../src/e-util/e-table-header-item.c:1638
+#: ../src/e-util/e-table-header-item.c:1639
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../src/e-util/e-table-header-item.c:1641
+#: ../src/e-util/e-table-header-item.c:1642
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1646
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../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:1652
+#: ../src/e-util/e-table-header-item.c:1653
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-table-header-item.c:1655
+#: ../src/e-util/e-table-header-item.c:1656
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1659
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../src/e-util/e-table-header-item.c:1662
+#: ../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:1729
+#: ../src/e-util/e-table-header-item.c:1730
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1752
+#: ../src/e-util/e-table-header-item.c:1753
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../src/e-util/e-text.c:2105
+#: ../src/e-util/e-text.c:2100
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../src/e-util/e-text.c:2118
+#: ../src/e-util/e-text.c:2113
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
@@ -15533,7 +15543,6 @@ msgid "Failed to save changes"
 msgstr "Muutoksia ei voitu tallentaa"
 
 #: ../src/e-util/e-webdav-browser.c:1815
-#| msgid "Creating a memo"
 msgid "Creating new book…"
 msgstr "Luodaan uutta kirjaa…"
 
@@ -15550,7 +15559,6 @@ msgid "Failed to create new calendar"
 msgstr "Uuden kalenterin luominen epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:1821
-#| msgid "Create a new contact"
 msgid "Creating new collection…"
 msgstr "Luodaan uutta kokoelmaa…"
 
@@ -15568,7 +15576,6 @@ msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
 #: ../src/e-util/e-webdav-browser.c:2189
-#| msgid "Delete Memo"
 msgid "Deleting book…"
 msgstr "Poistetaan kirjaa…"
 
@@ -15585,7 +15592,6 @@ msgid "Failed to delete calendar"
 msgstr "Kalenterin poisto epäonnistui"
 
 #: ../src/e-util/e-webdav-browser.c:2197
-#| msgid "Delete the selection"
 msgid "Deleting collection…"
 msgstr "Poistetaan kokoelmaa…"
 
@@ -15617,15 +15623,6 @@ msgstr "_Luo kalenteri"
 msgid "Create Collectio_n"
 msgstr "Luo _kokoelma"
 
-#. 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-webdav-browser.c:2699 ../src/mail/em-subscription-editor.c:1948
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
-msgid "_Refresh"
-msgstr "_Päivitä"
-
 #: ../src/e-util/e-web-view.c:348
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
@@ -15674,50 +15671,50 @@ msgstr "Tal_lenna kuva..."
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2025
+#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2032
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../src/e-util/e-web-view.c:1379
+#: ../src/e-util/e-web-view.c:1381
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../src/e-util/e-web-view.c:1381
+#: ../src/e-util/e-web-view.c:1383
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../src/e-util/e-web-view.c:1392
+#: ../src/e-util/e-web-view.c:1394
 #, 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:1394
+#: ../src/e-util/e-web-view.c:1396
 #, 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:1398
+#: ../src/e-util/e-web-view.c:1400
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../src/e-util/e-web-view.c:3928
+#: ../src/e-util/e-web-view.c:3953
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:4116
+#: ../src/e-util/e-web-view.c:4141
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/e-util/e-web-view.c:4157
+#: ../src/e-util/e-web-view.c:4182
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../src/e-util/e-web-view.c:4252
+#: ../src/e-util/e-web-view.c:4277
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -16035,50 +16032,50 @@ msgid "Invalid folder URI “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-properties.c:1150 ../src/mail/em-folder-tree-model.c:1237
+#: ../src/libemail-engine/e-mail-session.c:117
+#: ../src/mail/em-folder-properties.c:1143 ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1035
-#: ../src/modules/mail/e-mail-shell-view-private.c:1046
+#: ../src/modules/mail/e-mail-shell-view-private.c:1003
+#: ../src/modules/mail/e-mail-shell-view-private.c:1014
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/libemail-engine/e-mail-session.c:118
 #: ../src/mail/em-folder-tree-model.c:1230 ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1033
+#: ../src/modules/mail/e-mail-shell-view-private.c:1001
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/libemail-engine/e-mail-session.c:119
 #: ../src/mail/em-folder-tree-model.c:1241 ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1037
+#: ../src/modules/mail/e-mail-shell-view-private.c:1005
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/libemail-engine/e-mail-session.c:120
 #: ../src/mail/em-folder-tree-model.c:1245 ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1039
+#: ../src/modules/mail/e-mail-shell-view-private.c:1007
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:125
-#: ../src/mail/em-folder-tree-model.c:1233 ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1041
-#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../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/modules/mail/e-mail-shell-view-private.c:1009
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../src/libemail-engine/e-mail-session.c:1297
+#: ../src/libemail-engine/e-mail-session.c:1294
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../src/libemail-engine/e-mail-session.c:1354
+#: ../src/libemail-engine/e-mail-session.c:1351
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been cancelled."
@@ -16086,18 +16083,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:1367
+#: ../src/libemail-engine/e-mail-session.c:1364
 #, 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:1519
+#: ../src/libemail-engine/e-mail-session.c:1516
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:2460
+#: ../src/libemail-engine/e-mail-session.c:1636
+msgid "Looking up recipient S/MIME certificates in address books…"
+msgstr ""
+
+#: ../src/libemail-engine/e-mail-session.c:1638
+msgid "Looking up recipient PGP keys in address books…"
+msgstr ""
+
+#: ../src/libemail-engine/e-mail-session.c:2641
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for “%s”"
@@ -16109,29 +16114,29 @@ msgstr "Tallennetaan kansiota %s"
 msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:616
-#: ../src/libemail-engine/mail-ops.c:708
+#: ../src/libemail-engine/e-mail-session-utils.c:613
+#: ../src/libemail-engine/mail-ops.c:707
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Posting message to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:653
-#: ../src/libemail-engine/mail-ops.c:744
+#: ../src/libemail-engine/e-mail-session-utils.c:650
+#: ../src/libemail-engine/mail-ops.c:743
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:686
-#: ../src/libemail-engine/e-mail-session-utils.c:721
-#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
+#: ../src/libemail-engine/e-mail-session-utils.c:683
+#: ../src/libemail-engine/e-mail-session-utils.c:718
+#: ../src/libemail-engine/mail-ops.c:771 ../src/libemail-engine/mail-ops.c:806
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Storing sent message to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:710
-#: ../src/libemail-engine/mail-ops.c:796
+#: ../src/libemail-engine/e-mail-session-utils.c:707
+#: ../src/libemail-engine/mail-ops.c:795
 #, fuzzy, c-format
 #| msgid ""
 #| "Failed to append to %s: %s\n"
@@ -16143,16 +16148,16 @@ msgstr ""
 "Kansioon %s lisääminen epäonnistui: %s\n"
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:740
-#: ../src/libemail-engine/mail-ops.c:824
+#: ../src/libemail-engine/e-mail-session-utils.c:737
+#: ../src/libemail-engine/mail-ops.c:823
 #, fuzzy, c-format
 #| msgid "Failed to append to local 'Sent' folder: %s"
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:928
-#: ../src/libemail-engine/mail-ops.c:985 ../src/libemail-engine/mail-ops.c:1098
-#: ../src/mail/mail-send-recv.c:636
+#: ../src/libemail-engine/e-mail-session-utils.c:925
+#: ../src/libemail-engine/mail-ops.c:984 ../src/libemail-engine/mail-ops.c:1097
+#: ../src/mail/mail-send-recv.c:635
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
@@ -16174,11 +16179,11 @@ msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 msgid "Preparing account “%s” for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 
-#: ../src/libemail-engine/mail-ops.c:88
+#: ../src/libemail-engine/mail-ops.c:87
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../src/libemail-engine/mail-ops.c:146
+#: ../src/libemail-engine/mail-ops.c:145
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location set in "
@@ -16187,13 +16192,13 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:226
+#: ../src/libemail-engine/mail-ops.c:225
 #, fuzzy, c-format
 #| msgid "Fetching mail from '%s'"
 msgid "Fetching mail from “%s”"
 msgstr "Noudetaan viestejä kohteesta '%s'"
 
-#: ../src/libemail-engine/mail-ops.c:738
+#: ../src/libemail-engine/mail-ops.c:737
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in "
@@ -16202,7 +16207,7 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:996
+#: ../src/libemail-engine/mail-ops.c:995
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
@@ -16210,58 +16215,58 @@ msgstr "Lähetetään viestiä %d / %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1054
+#: ../src/libemail-engine/mail-ops.c:1053
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Viestin lähetys epäonnistui"
 msgstr[1] "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../src/libemail-engine/mail-ops.c:1060
+#: ../src/libemail-engine/mail-ops.c:1059
 msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../src/libemail-engine/mail-ops.c:1062
+#: ../src/libemail-engine/mail-ops.c:1061
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../src/libemail-engine/mail-ops.c:1184
+#: ../src/libemail-engine/mail-ops.c:1183
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Moving messages to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1185
+#: ../src/libemail-engine/mail-ops.c:1184
 #, fuzzy, c-format
 #| msgid "Copying messages to '%s'"
 msgid "Copying messages to “%s”"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1304
+#: ../src/libemail-engine/mail-ops.c:1303
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../src/libemail-engine/mail-ops.c:1432
+#: ../src/libemail-engine/mail-ops.c:1431
 #, fuzzy, c-format
 #| msgid "Expunging and storing account '%s'"
 msgid "Expunging and storing account “%s”"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1433
+#: ../src/libemail-engine/mail-ops.c:1432
 #, fuzzy, c-format
 #| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1508
+#: ../src/libemail-engine/mail-ops.c:1507
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1600
+#: ../src/libemail-engine/mail-ops.c:1599
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Processing folder changes in “%s”"
@@ -16360,68 +16365,73 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../src/mail/e-mail-autoconfig.c:648
+#: ../src/mail/e-mail-autoconfig.c:436
+#, fuzzy, c-format
+msgid "Invalid URI: “%s”"
+msgstr "Virheellinen kansio: ”%s”"
+
+#: ../src/mail/e-mail-autoconfig.c:731
 #, c-format
 msgid "Host: %s:%d"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:652
+#: ../src/mail/e-mail-autoconfig.c:735
 #, c-format
 msgid "User: %s"
 msgstr "Käyttäjä: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:656
+#: ../src/mail/e-mail-autoconfig.c:739
 #, fuzzy, c-format
 #| msgid "Security:"
 msgid "Security method: %s"
 msgstr "Salaus:"
 
-#: ../src/mail/e-mail-autoconfig.c:657 ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:740 ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:658 ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:741 ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:662
-#, fuzzy, c-format
+#: ../src/mail/e-mail-autoconfig.c:745
+#, c-format
 #| msgid "Authentication"
 msgid "Authentication mechanism: %s"
-msgstr "Kirjautuminen"
+msgstr "Tunnistautumismekanismi: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:821
+#: ../src/mail/e-mail-autoconfig.c:904
 msgid "No email address provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../src/mail/e-mail-autoconfig.c:830
+#: ../src/mail/e-mail-autoconfig.c:913
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../src/mail/e-mail-autoconfig.c:1167
+#: ../src/mail/e-mail-autoconfig.c:1252
 #: ../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:1174
+#: ../src/mail/e-mail-autoconfig.c:1259
 #: ../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:1181
+#: ../src/mail/e-mail-autoconfig.c:1266
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
-#: ../src/mail/e-mail-browser.c:130 ../src/shell/e-shell-window-actions.c:812
-#: ../src/shell/e-shell-window-actions.c:819
-#: ../src/shell/e-shell-window-actions.c:826
+#: ../src/mail/e-mail-browser.c:133 ../src/shell/e-shell-window-actions.c:796
+#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:810
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-browser.c:288
+#: ../src/mail/e-mail-browser.c:291
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -16443,13 +16453,12 @@ msgstr "Evolutionin sähköpostitilien apulainen"
 msgid "_Revise Details"
 msgstr "_Tarkista tiedot"
 
-#: ../src/mail/e-mail-config-auth-check.c:180
-#, fuzzy
+#: ../src/mail/e-mail-config-auth-check.c:217
 #| msgid "%s authentication failed"
 msgid "Querying authentication types..."
-msgstr "%s-tunnistautuminen epäonnistui"
+msgstr "Kysellään tunnistautumistyyppejä..."
 
-#: ../src/mail/e-mail-config-auth-check.c:393
+#: ../src/mail/e-mail-config-auth-check.c:430
 msgid "Check for Supported Types"
 msgstr "Tarkista tuetut tyypit"
 
@@ -16499,7 +16508,8 @@ msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 msgid "Re_ply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../src/mail/e-mail-config-composing-page.c:488 ../src/mail/mail-config.ui.h:20
+#: ../src/mail/e-mail-config-composing-page.c:488
+#: ../src/mail/em-composer-utils.c:4058 ../src/mail/mail-config.ui.h:20
 #, fuzzy
 #| msgid "Start _typing at the bottom on replying"
 msgid "Start _typing at the bottom"
@@ -16582,7 +16592,7 @@ msgid "Archi_ve Folder:"
 msgstr "A_rkistointikansio:"
 
 #: ../src/mail/e-mail-config-defaults-page.c:785
-#: ../src/modules/mail/em-mailer-prefs.c:1413
+#: ../src/modules/mail/em-mailer-prefs.c:1517
 msgid "Choose a folder to archive messages to."
 msgstr "Valitse kansio johon viesti arkistoidaan."
 
@@ -16721,15 +16731,15 @@ msgstr "Tilin nimi ei voi olla tyhjä"
 msgid "Looking up account details..."
 msgstr "Etsitään tilin tietoja..."
 
-#: ../src/mail/e-mail-config-provider-page.c:537
+#: ../src/mail/e-mail-config-provider-page.c:538
 msgid "Checking for New Mail"
 msgstr "Tarkistetaan uusia viestejä"
 
-#: ../src/mail/e-mail-config-provider-page.c:553
+#: ../src/mail/e-mail-config-provider-page.c:554
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../src/mail/e-mail-config-provider-page.c:763
+#: ../src/mail/e-mail-config-provider-page.c:764
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
@@ -16739,114 +16749,114 @@ msgstr "Vastaanotto"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:231
+#: ../src/mail/e-mail-config-security-page.c:379
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:318
-#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
+#: ../src/mail/e-mail-config-security-page.c:460
+#: ../src/mail/em-folder-properties.c:1062 ../src/mail/mail-config.ui.h:32
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:642
+#: ../src/modules/calendar/e-calendar-preferences.c:643
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:753
+#: ../src/modules/mail/e-mail-shell-backend.c:754
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/mail/e-mail-config-security-page.c:327
+#: ../src/mail/e-mail-config-security-page.c:469
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../src/mail/e-mail-config-security-page.c:349
+#: ../src/mail/e-mail-config-security-page.c:491
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP) -salaus"
 
-#: ../src/mail/e-mail-config-security-page.c:358
+#: ../src/mail/e-mail-config-security-page.c:500
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP_-avaimen ID:"
 
-#: ../src/mail/e-mail-config-security-page.c:391
+#: ../src/mail/e-mail-config-security-page.c:531
 msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
-#: ../src/mail/e-mail-config-security-page.c:407
-#: ../src/mail/e-mail-config-security-page.c:571 ../src/mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:547
+#: ../src/mail/e-mail-config-security-page.c:711 ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:410
-#: ../src/mail/e-mail-config-security-page.c:574 ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-config-security-page.c:550
+#: ../src/mail/e-mail-config-security-page.c:714 ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:413
-#: ../src/mail/e-mail-config-security-page.c:577 ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:553
+#: ../src/mail/e-mail-config-security-page.c:717 ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:416
-#: ../src/mail/e-mail-config-security-page.c:580 ../src/mail/mail-config.ui.h:80
+#: ../src/mail/e-mail-config-security-page.c:556
+#: ../src/mail/e-mail-config-security-page.c:720 ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:432
+#: ../src/mail/e-mail-config-security-page.c:572
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../src/mail/e-mail-config-security-page.c:444
+#: ../src/mail/e-mail-config-security-page.c:584
 msgid "Always enc_rypt 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:456
+#: ../src/mail/e-mail-config-security-page.c:596
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../src/mail/e-mail-config-security-page.c:468
+#: ../src/mail/e-mail-config-security-page.c:608
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../src/mail/e-mail-config-security-page.c:480
+#: ../src/mail/e-mail-config-security-page.c:620
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr ""
 
-#: ../src/mail/e-mail-config-security-page.c:504
+#: ../src/mail/e-mail-config-security-page.c:644
 msgid "Secure MIME (S/MIME)"
 msgstr "Suojattu MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:513
+#: ../src/mail/e-mail-config-security-page.c:653
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../src/mail/e-mail-config-security-page.c:537
-#: ../src/mail/e-mail-config-security-page.c:635
+#: ../src/mail/e-mail-config-security-page.c:677
+#: ../src/mail/e-mail-config-security-page.c:775
 msgid "Select"
 msgstr "Valitse"
 
-#: ../src/mail/e-mail-config-security-page.c:546
-#: ../src/mail/e-mail-config-security-page.c:644 ../src/mail/mail-dialogs.ui.h:16
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../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:892
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../src/mail/e-mail-config-security-page.c:555
+#: ../src/mail/e-mail-config-security-page.c:695
 msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
-#: ../src/mail/e-mail-config-security-page.c:596
+#: ../src/mail/e-mail-config-security-page.c:736
 msgid "Always sign outgoing messages when using this account"
 msgstr "Allekirjoita aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../src/mail/e-mail-config-security-page.c:611
+#: ../src/mail/e-mail-config-security-page.c:751
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
-#: ../src/mail/e-mail-config-security-page.c:653
+#: ../src/mail/e-mail-config-security-page.c:793
 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:665
+#: ../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"
@@ -16856,7 +16866,7 @@ msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../src/mail/e-mail-config-service-page.c:499
+#: ../src/mail/e-mail-config-service-page.c:501
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
@@ -16890,12 +16900,12 @@ msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
 #: ../src/mail/e-mail-config-summary-page.c:452
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:657
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
 msgid "Server:"
 msgstr "Palvelin:"
 
 #: ../src/mail/e-mail-config-summary-page.c:473
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
@@ -17080,12 +17090,12 @@ msgstr "Te_htävää"
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1243
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
+#: ../src/mail/em-folder-properties.c:834
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:869
+#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:861
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
@@ -17101,29 +17111,29 @@ msgstr ""
 msgid "Color"
 msgstr "Väri"
 
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
+#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:740
 #, fuzzy
 #| msgid "Messages"
 msgid "Message Note"
 msgstr "Viestit"
 
-#: ../src/mail/e-mail-notes.c:639
+#: ../src/mail/e-mail-notes.c:660
 #, fuzzy
 #| msgid "Copying messages into folder %s"
 msgid "Cannot find message in its folder summary"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../src/mail/e-mail-notes.c:842
+#: ../src/mail/e-mail-notes.c:863
 msgid "Storing changes..."
 msgstr "Tallennetaan muutoksia..."
 
-#: ../src/mail/e-mail-notes.c:968
+#: ../src/mail/e-mail-notes.c:989
 #, fuzzy
 #| msgid "_Edit Message"
 msgid "Edit Message Note"
 msgstr "_Muokkaa viestiä"
 
-#: ../src/mail/e-mail-notes.c:1122
+#: ../src/mail/e-mail-notes.c:1143
 msgid "Retrieving message..."
 msgstr "Noudetaan viestiä..."
 
@@ -17163,656 +17173,706 @@ msgstr "Otsakkeen nimi"
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:130
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../src/mail/e-mail-printer.c:142
+#: ../src/mail/e-mail-printer.c:145
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../src/mail/e-mail-reader.c:529
+#: ../src/mail/e-mail-reader.c:610
 msgid "Deleting message note..."
 msgstr "Poistetaan viestin huomautus..."
 
-#: ../src/mail/e-mail-reader.c:1386 ../src/mail/e-mail-reader.c:1598
-#: ../src/mail/e-mail-reader.c:1638
+#: ../src/mail/e-mail-reader.c:1577 ../src/mail/e-mail-reader.c:1868
+#: ../src/mail/e-mail-reader.c:1908
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../src/mail/e-mail-reader.c:1644
+#: ../src/mail/e-mail-reader.c:1914
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../src/mail/e-mail-reader.c:1847
+#: ../src/mail/e-mail-reader.c:2118
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../src/mail/e-mail-reader.c:1892 ../src/mail/e-mail-reader.c:3251
+#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3624
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä “%s”"
 
-#: ../src/mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2352
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2082
+#: ../src/mail/e-mail-reader.c:2354
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2087
+#: ../src/mail/e-mail-reader.c:2359
 msgid "_Archive..."
 msgstr "_Arkistoi..."
 
-#: ../src/mail/e-mail-reader.c:2089
+#: ../src/mail/e-mail-reader.c:2361
 #, 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:2094
+#: ../src/mail/e-mail-reader.c:2366
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2096
+#: ../src/mail/e-mail-reader.c:2368
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2101
+#: ../src/mail/e-mail-reader.c:2373
+#, fuzzy
+#| msgid "Assign Color"
+msgid "Assign C_olor…"
+msgstr "Aseta väri"
+
+#: ../src/mail/e-mail-reader.c:2375
+#, 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:2380
+#, fuzzy
+#| msgid "Unset Color"
+msgid "Unse_t Color"
+msgstr "Poista värin asetus"
+
+#: ../src/mail/e-mail-reader.c:2382
+#, fuzzy
+#| msgid "Undelete the selected messages"
+msgid "Unset color for the selected messages"
+msgstr "Palauta valitut viestit"
+
+#: ../src/mail/e-mail-reader.c:2387
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../src/mail/e-mail-reader.c:2103
+#: ../src/mail/e-mail-reader.c:2389
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2108
+#: ../src/mail/e-mail-reader.c:2394
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../src/mail/e-mail-reader.c:2110
+#: ../src/mail/e-mail-reader.c:2396
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../src/mail/e-mail-reader.c:2115
+#: ../src/mail/e-mail-reader.c:2401
 msgid "_Add note..."
 msgstr "_Lisää huomautus..."
 
-#: ../src/mail/e-mail-reader.c:2117
+#: ../src/mail/e-mail-reader.c:2403
 #, 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:2122
+#: ../src/mail/e-mail-reader.c:2408
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../src/mail/e-mail-reader.c:2124
+#: ../src/mail/e-mail-reader.c:2410
 #, 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:2129
+#: ../src/mail/e-mail-reader.c:2415
 msgid "_Edit note..."
 msgstr "_Muokkaa huomautusta..."
 
-#: ../src/mail/e-mail-reader.c:2131
+#: ../src/mail/e-mail-reader.c:2417
 #, 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:2136
+#: ../src/mail/e-mail-reader.c:2422
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2138
+#: ../src/mail/e-mail-reader.c:2424
 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:2143
+#: ../src/mail/e-mail-reader.c:2429
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2145
+#: ../src/mail/e-mail-reader.c:2431
 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:2150
+#: ../src/mail/e-mail-reader.c:2436
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2152
+#: ../src/mail/e-mail-reader.c:2438
 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:2157
+#: ../src/mail/e-mail-reader.c:2443
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2159
+#: ../src/mail/e-mail-reader.c:2445
 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:2164
+#: ../src/mail/e-mail-reader.c:2450
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../src/mail/e-mail-reader.c:2166
+#: ../src/mail/e-mail-reader.c:2452
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../src/mail/e-mail-reader.c:2171
+#: ../src/mail/e-mail-reader.c:2457
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../src/mail/e-mail-reader.c:2173
+#: ../src/mail/e-mail-reader.c:2459
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/e-mail-reader.c:2178
+#: ../src/mail/e-mail-reader.c:2464
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../src/mail/e-mail-reader.c:2180
+#: ../src/mail/e-mail-reader.c:2466
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../src/mail/e-mail-reader.c:2185
+#: ../src/mail/e-mail-reader.c:2471
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2187
+#: ../src/mail/e-mail-reader.c:2473
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2192
+#: ../src/mail/e-mail-reader.c:2478
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../src/mail/e-mail-reader.c:2194
+#: ../src/mail/e-mail-reader.c:2480
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../src/mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2485
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../src/mail/e-mail-reader.c:2201 ../src/mail/e-mail-reader.c:2208
+#: ../src/mail/e-mail-reader.c:2487 ../src/mail/e-mail-reader.c:2494
 #: ../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:2206
+#: ../src/mail/e-mail-reader.c:2492
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2213
+#: ../src/mail/e-mail-reader.c:2499
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../src/mail/e-mail-reader.c:2215 ../src/mail/e-mail-reader.c:2222
+#: ../src/mail/e-mail-reader.c:2501 ../src/mail/e-mail-reader.c:2508
 #: ../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:2220
+#: ../src/mail/e-mail-reader.c:2506
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../src/mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2513
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2229 ../src/mail/e-mail-reader.c:2236
+#: ../src/mail/e-mail-reader.c:2515 ../src/mail/e-mail-reader.c:2522
 #: ../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:2234
+#: ../src/mail/e-mail-reader.c:2520
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2241
+#: ../src/mail/e-mail-reader.c:2527
+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:2536
+msgid "N_one"
+msgstr "Ei _mitään"
+
+#: ../src/mail/e-mail-reader.c:2543
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../src/mail/e-mail-reader.c:2243
+#: ../src/mail/e-mail-reader.c:2545
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../src/mail/e-mail-reader.c:2248 ../src/mail/e-mail-reader.c:2638
+#: ../src/mail/e-mail-reader.c:2550 ../src/mail/e-mail-reader.c:2962
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../src/mail/e-mail-reader.c:2250
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2255 ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2557 ../src/mail/e-mail-reader.c:2966
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../src/mail/e-mail-reader.c:2257
+#: ../src/mail/e-mail-reader.c:2559
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2262
+#: ../src/mail/e-mail-reader.c:2564
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../src/mail/e-mail-reader.c:2264
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../src/mail/e-mail-reader.c:2269
+#: ../src/mail/e-mail-reader.c:2571
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2271
+#: ../src/mail/e-mail-reader.c:2573
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2578
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2278
+#: ../src/mail/e-mail-reader.c:2580
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2283
+#: ../src/mail/e-mail-reader.c:2585
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/mail/e-mail-reader.c:2285
+#: ../src/mail/e-mail-reader.c:2587
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../src/mail/e-mail-reader.c:2290 ../src/mail/e-mail-reader.c:2662
+#: ../src/mail/e-mail-reader.c:2592 ../src/mail/e-mail-reader.c:2986
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/mail/e-mail-reader.c:2292
+#: ../src/mail/e-mail-reader.c:2594
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2297 ../src/mail/e-mail-reader.c:2666
+#: ../src/mail/e-mail-reader.c:2599 ../src/mail/e-mail-reader.c:2990
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2299
+#: ../src/mail/e-mail-reader.c:2601
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2304
+#: ../src/mail/e-mail-reader.c:2606
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../src/mail/e-mail-reader.c:2306
+#: ../src/mail/e-mail-reader.c:2608
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../src/mail/e-mail-reader.c:2311
+#: ../src/mail/e-mail-reader.c:2613
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../src/mail/e-mail-reader.c:2313
+#: ../src/mail/e-mail-reader.c:2615
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../src/mail/e-mail-reader.c:2318
+#: ../src/mail/e-mail-reader.c:2620
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../src/mail/e-mail-reader.c:2320
+#: ../src/mail/e-mail-reader.c:2622
 #: ../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:2325
+#: ../src/mail/e-mail-reader.c:2627
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../src/mail/e-mail-reader.c:2327
+#: ../src/mail/e-mail-reader.c:2629
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../src/mail/e-mail-reader.c:2332
+#: ../src/mail/e-mail-reader.c:2634
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2334
+#: ../src/mail/e-mail-reader.c:2636
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2339
+#: ../src/mail/e-mail-reader.c:2641
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../src/mail/e-mail-reader.c:2341
+#: ../src/mail/e-mail-reader.c:2643
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2648
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2348
+#: ../src/mail/e-mail-reader.c:2650
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2655
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2355
+#: ../src/mail/e-mail-reader.c:2657
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2360
+#: ../src/mail/e-mail-reader.c:2662
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../src/mail/e-mail-reader.c:2362
+#: ../src/mail/e-mail-reader.c:2664
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2669
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2369
+#: ../src/mail/e-mail-reader.c:2671
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2676
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2376
+#: ../src/mail/e-mail-reader.c:2678
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2683
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2383
+#: ../src/mail/e-mail-reader.c:2685
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2690
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2390
+#: ../src/mail/e-mail-reader.c:2692
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2697
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2699
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2706
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../src/mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2713
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2718
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2720
 #: ../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:2423
+#: ../src/mail/e-mail-reader.c:2725
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2727
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2732
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2734
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../src/mail/e-mail-reader.c:2437 ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/mail/e-mail-reader.c:2739 ../src/mail/em-composer-utils.c:4012
+#: ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../src/mail/e-mail-reader.c:2439
+#: ../src/mail/e-mail-reader.c:2741
 #: ../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:2444 ../src/mail/mail.error.xml.h:26
+#: ../src/mail/e-mail-reader.c:2746
+msgid "Al_ternative Reply…"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2748
+#, 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:2753 ../src/mail/em-composer-utils.c:4007
+#: ../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:2446
+#: ../src/mail/e-mail-reader.c:2755
 #: ../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:2451
+#: ../src/mail/e-mail-reader.c:2760
 #: ../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:2453
+#: ../src/mail/e-mail-reader.c:2762
 #: ../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:2458
+#: ../src/mail/e-mail-reader.c:2767
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../src/mail/e-mail-reader.c:2460
+#: ../src/mail/e-mail-reader.c:2769
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2774
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2467
+#: ../src/mail/e-mail-reader.c:2776
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2788
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../src/mail/e-mail-reader.c:2481
+#: ../src/mail/e-mail-reader.c:2790
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2795
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/mail/e-mail-reader.c:2488
+#: ../src/mail/e-mail-reader.c:2797
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2802
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../src/mail/e-mail-reader.c:2495
+#: ../src/mail/e-mail-reader.c:2804
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2811
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2818
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2825
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2832
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../src/mail/e-mail-reader.c:2530
+#: ../src/mail/e-mail-reader.c:2839
+msgid "_Label"
+msgstr "_Merkintä"
+
+#: ../src/mail/e-mail-reader.c:2846
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:2537
+#: ../src/mail/e-mail-reader.c:2853
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../src/mail/e-mail-reader.c:2544
+#: ../src/mail/e-mail-reader.c:2860
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../src/mail/e-mail-reader.c:2551
+#: ../src/mail/e-mail-reader.c:2867
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2874
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../src/mail/e-mail-reader.c:2568
+#: ../src/mail/e-mail-reader.c:2884
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../src/mail/e-mail-reader.c:2570
+#: ../src/mail/e-mail-reader.c:2886
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../src/mail/e-mail-reader.c:2575
+#: ../src/mail/e-mail-reader.c:2891
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2893
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../src/mail/e-mail-reader.c:2582
+#: ../src/mail/e-mail-reader.c:2898
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2900
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../src/mail/e-mail-reader.c:2589
+#: ../src/mail/e-mail-reader.c:2905
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2907
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../src/mail/e-mail-reader.c:2630
+#: ../src/mail/e-mail-reader.c:2954
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../src/mail/e-mail-reader.c:2646
+#: ../src/mail/e-mail-reader.c:2970
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../src/mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:2974
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2654
+#: ../src/mail/e-mail-reader.c:2978
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2658
+#: ../src/mail/e-mail-reader.c:2982
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:2994
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../src/mail/e-mail-reader.c:2674
+#: ../src/mail/e-mail-reader.c:2998
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/mail/e-mail-reader.c:2718
+#: ../src/mail/e-mail-reader.c:3042
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../src/mail/e-mail-reader.c:2720
+#: ../src/mail/e-mail-reader.c:3044
 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:2726
+#: ../src/mail/e-mail-reader.c:3050
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../src/mail/e-mail-reader.c:2728
+#: ../src/mail/e-mail-reader.c:3052
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../src/mail/e-mail-reader.c:3257
+#: ../src/mail/e-mail-reader.c:3630
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../src/mail/e-mail-reader.c:4327
+#: ../src/mail/e-mail-reader.c:4927
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../src/mail/e-mail-reader.c:4328
+#: ../src/mail/e-mail-reader.c:4928
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
@@ -17821,52 +17881,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:4347
+#: ../src/mail/e-mail-reader.c:4947
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:4348
+#: ../src/mail/e-mail-reader.c:4948
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:4414 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5014 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/mail/e-mail-reader.c:4426
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
+#: ../src/mail/e-mail-reader.c:5026
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/mail/e-mail-reader.c:4430
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../src/mail/e-mail-reader.c:5030
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/mail/e-mail-reader.c:4439 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5039 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../src/mail/e-mail-reader.c:5502
+#: ../src/mail/e-mail-reader.c:6194
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:5504
+#: ../src/mail/e-mail-reader.c:6196
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:5521
+#: ../src/mail/e-mail-reader.c:6213
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Salli etäsisältö lähettäjältä %s"
 
-#: ../src/mail/e-mail-reader.c:5538
+#: ../src/mail/e-mail-reader.c:6230
 msgid "Do not show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../src/mail/e-mail-reader.c:5590
+#: ../src/mail/e-mail-reader.c:6282
 msgid "Load remote content"
 msgstr "Lataa etäsisältö"
 
@@ -17874,42 +17934,42 @@ msgstr "Lataa etäsisältö"
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
 
-#: ../src/mail/e-mail-reader-utils.c:633
+#: ../src/mail/e-mail-reader-utils.c:632
 #, fuzzy, c-format
 #| msgid "Saving message to folder “%s”"
 msgid "Deleting messages in Junk folder “%s”…"
 msgstr "Tallennetaan viesti kansioon “%s”"
 
-#: ../src/mail/e-mail-reader-utils.c:728
+#: ../src/mail/e-mail-reader-utils.c:727
 #, c-format
 msgid "Refreshing folder “%s”"
 msgstr "Päivitetään kansiota “%s”"
 
-#: ../src/mail/e-mail-reader-utils.c:1335
+#: ../src/mail/e-mail-reader-utils.c:1334
 #, fuzzy
 #| msgid "Preview data to be imported"
 msgid "Marking thread to be ignored"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../src/mail/e-mail-reader-utils.c:1339
+#: ../src/mail/e-mail-reader-utils.c:1338
 msgid "Unmarking thread from being ignored"
 msgstr ""
 
-#: ../src/mail/e-mail-reader-utils.c:1343
+#: ../src/mail/e-mail-reader-utils.c:1342
 msgid "Marking subthread to be ignored"
 msgstr ""
 
-#: ../src/mail/e-mail-reader-utils.c:1347
+#: ../src/mail/e-mail-reader-utils.c:1346
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../src/mail/e-mail-reader-utils.c:1599
+#: ../src/mail/e-mail-reader-utils.c:1601
 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:1836
+#: ../src/mail/e-mail-reader-utils.c:1838
 #, fuzzy, c-format
 #| msgid ""
 #| "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
@@ -17925,7 +17985,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 
-#: ../src/mail/e-mail-reader-utils.c:2854
+#: ../src/mail/e-mail-reader-utils.c:2859
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -17936,24 +17996,32 @@ 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:2875
+#: ../src/mail/e-mail-reader-utils.c:2880
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../src/mail/e-mail-reader-utils.c:3271
+#: ../src/mail/e-mail-reader-utils.c:3294
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
-#: ../src/mail/e-mail-request.c:270
+#: ../src/mail/e-mail-request.c:276
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
-#: ../src/mail/e-mail-tag-editor.c:163
+#: ../src/mail/e-mail-tag-editor.c:155
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
+#: ../src/mail/e-mail-tag-editor.c:161
+msgid "Cl_ear"
+msgstr ""
+
+#: ../src/mail/e-mail-templates-store.c:115
+msgid "No Title"
+msgstr "Ei otsikkoa"
+
 #: ../src/mail/e-mail-ui-session.c:820
 #, c-format
 msgid "%s authentication failed"
@@ -17965,7 +18033,7 @@ msgid "No data source found for UID “%s”"
 msgstr ""
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:388
+#: ../src/mail/em-composer-utils.c:394
 #, fuzzy, c-format
 #| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
@@ -17976,7 +18044,7 @@ msgstr[1] ""
 "Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia (Bcc)?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:394
+#: ../src/mail/em-composer-utils.c:400
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This would "
@@ -17993,7 +18061,7 @@ 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:800
+#: ../src/mail/em-composer-utils.c:828
 msgid "Waiting for attachments to load..."
 msgstr "Odotetaan liitteiden latautumista..."
 
@@ -18001,7 +18069,7 @@ msgstr "Odotetaan liitteiden latautumista..."
 #. * 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:1991
+#: ../src/mail/em-composer-utils.c:2019
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18009,32 +18077,106 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../src/mail/em-composer-utils.c:1997
+#: ../src/mail/em-composer-utils.c:2025
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../src/mail/em-composer-utils.c:2002
+#: ../src/mail/em-composer-utils.c:2030
 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:2711
+#: ../src/mail/em-composer-utils.c:2714
 #, fuzzy, c-format
 #| msgid "URL: %s"
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "URL: %s"
 
-#: ../src/mail/em-composer-utils.c:3257
+#: ../src/mail/em-composer-utils.c:3324
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
+#: ../src/mail/em-composer-utils.c:3958
+msgid "Alternative Reply"
+msgstr ""
+
+#: ../src/mail/em-composer-utils.c:3961
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+msgid "_Reply"
+msgstr "_Vastaa"
+
+#: ../src/mail/em-composer-utils.c:3974
+#, fuzzy
+#| msgid "Recipients"
+msgid "Recipients:"
+msgstr "Vastaanottajat"
+
+#: ../src/mail/em-composer-utils.c:4002
+#, fuzzy
+#| msgid "_Reply to Sender"
+msgid "Reply to _Sender"
+msgstr "_Vastaa lähettäjälle"
+
+#: ../src/mail/em-composer-utils.c:4024
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "Reply style:"
+msgstr "_Vastaustyyli:"
+
+#: ../src/mail/em-composer-utils.c:4032
+msgid "_Default"
+msgstr "Oletu_s"
+
+#: ../src/mail/em-composer-utils.c:4036
+msgid "Attach_ment"
+msgstr "Liit_e"
+
+#: ../src/mail/em-composer-utils.c:4040
+#, fuzzy
+#| msgctxt "ReplyForward"
+#| msgid "Inline (Outlook style)"
+msgid "Inline (_Outlook style)"
+msgstr "Sisennetty (Outlookin tapaan)"
+
+#: ../src/mail/em-composer-utils.c:4044
+msgid "_Quote"
+msgstr "_Lainaa"
+
+#: ../src/mail/em-composer-utils.c:4048
+msgid "Do _Not Quote"
+msgstr "_Älä lainaa"
+
+#: ../src/mail/em-composer-utils.c:4055
+msgid "_Format message in HTML"
+msgstr "Muotoile viesti _HTML:nä"
+
+#: ../src/mail/em-composer-utils.c:4065
+#, fuzzy
+#| msgid "_Template:"
+msgid "Apply t_emplate"
+msgstr "_Malli:"
+
+#: ../src/mail/em-composer-utils.c:4077
+#, fuzzy
+#| msgid "Original message"
+msgid "Preserve original message S_ubject"
+msgstr "Alkuperäinen viesti"
+
+#: ../src/mail/em-composer-utils.c:4143
+#, fuzzy, c-format
+#| msgid "Sender or Recipients"
+msgid "one recipient"
+msgid_plural "%d recipients"
+msgstr[0] "Lähettäjä tai vastaanottajat"
+msgstr[1] "Lähettäjä tai vastaanottajat"
+
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3741
+#: ../src/mail/em-composer-utils.c:4564
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../src/mail/em-composer-utils.c:3746
+#: ../src/mail/em-composer-utils.c:4569
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -18096,80 +18238,94 @@ msgid "_Send Account Override:"
 msgstr "_Lähetystilin ohitus:"
 
 #: ../src/mail/em-folder-properties.c:605
-msgid "_Archive this folder using these settings:"
+#, fuzzy
+#| msgid "_Archive this folder using these settings:"
+msgid "Archive this folder using these settings:"
 msgstr "_Arkistoi tämä kansio käyttäen seuraavia asetuksia:"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:614
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:617
+#, fuzzy
+#| msgctxt "autoarchive"
+#| msgid "_Cleanup messages older than"
 msgctxt "autoarchive"
-msgid "_Cleanup messages older than"
+msgid "Auto-_cleanup messages older than"
 msgstr "_Siivoa vanhemmat viestit kuin"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
 #: ../src/mail/em-folder-properties.c:630
 msgctxt "autoarchive"
 msgid "days"
 msgstr "päivää"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
 #: ../src/mail/em-folder-properties.c:632
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "viikkoa"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
 #: ../src/mail/em-folder-properties.c:634
 msgctxt "autoarchive"
 msgid "months"
 msgstr "kuukautta"
 
 #: ../src/mail/em-folder-properties.c:640
-msgid "Move old messages to the default archive _folder"
+#, 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:651
-msgid "_Move old messages to:"
+#: ../src/mail/em-folder-properties.c:647
+#, fuzzy
+#| msgid "_Move old messages to:"
+msgid "_Move messages to:"
 msgstr "Siirrä va_nhat viestit kansioon:"
 
-#: ../src/mail/em-folder-properties.c:655
-msgid "AutoArchive folder"
+#: ../src/mail/em-folder-properties.c:651
+#, fuzzy
+#| msgid "AutoArchive folder"
+msgid "Archive folder"
 msgstr "Automaattisen arkistoinnin kansio"
 
-#: ../src/mail/em-folder-properties.c:655
+#: ../src/mail/em-folder-properties.c:651
 #, fuzzy
 #| msgid "Select folder to import into"
-msgid "Select folder to use for AutoArchive"
+msgid "Select folder to use for Archive"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../src/mail/em-folder-properties.c:661
-msgid "_Delete old messages"
-msgstr "_Poista vanhat viestit"
+#: ../src/mail/em-folder-properties.c:655
+msgid "_Delete messages"
+msgstr "Poista _viestit"
 
-#: ../src/mail/em-folder-properties.c:1018
+#: ../src/mail/em-folder-properties.c:1010
 #, fuzzy
 #| msgid "Server Type:"
 msgid "Server Tag"
 msgstr "Palvelintyyppi:"
 
-#: ../src/mail/em-folder-properties.c:1022 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1014 ../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:1073
-msgid "AutoArchive"
-msgstr "Automaattinen arkistointi"
+#. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
+#: ../src/mail/em-folder-properties.c:1066
+#, fuzzy
+#| msgid "_Archive..."
+msgid "Archive"
+msgstr "_Arkistoi..."
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
+#: ../src/mail/em-folder-properties.c:1069 ../src/mail/mail-config.ui.h:121
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../src/mail/em-folder-properties.c:1155
+#: ../src/mail/em-folder-properties.c:1148
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../src/mail/em-folder-properties.c:1394
+#: ../src/mail/em-folder-properties.c:1387
 msgid "Gathering folder properties"
 msgstr "Kerätään kansion ominaisuuksia"
 
@@ -18213,27 +18369,27 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../src/mail/em-folder-tree.c:2279
+#: ../src/mail/em-folder-tree.c:2280
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2282
+#: ../src/mail/em-folder-tree.c:2283
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2595
+#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2598
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2597
+#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2600
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2312
+#: ../src/mail/em-folder-tree.c:2313
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
@@ -18249,25 +18405,21 @@ msgstr "Ladataan..."
 
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
-#| msgid "Removing folder “%s”"
 msgid "Moving folder “%s”"
 msgstr "Siirretään kansio “%s”"
 
 #: ../src/mail/em-folder-utils.c:113
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Copying folder “%s”"
 msgstr "Kopioidaan kansio “%s”"
 
 #: ../src/mail/em-folder-utils.c:252
 #, c-format
-#| msgid "Removing folder “%s”"
 msgid "Moving folder “%s” (%d/%d)"
 msgstr "Siirretään kansio “%s” (%d/%d)"
 
 #: ../src/mail/em-folder-utils.c:252
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Copying folder “%s” (%d/%d)"
 msgstr "Kopioidaan kansio “%s” (%d/%d)"
 
@@ -18291,94 +18443,94 @@ msgstr "_Tilaa näytetyt"
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../src/mail/em-subscription-editor.c:935 ../src/mail/em-subscription-editor.c:1886
+#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1888
 #: ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../src/mail/em-subscription-editor.c:944
+#: ../src/mail/em-subscription-editor.c:945
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../src/mail/em-subscription-editor.c:952
+#: ../src/mail/em-subscription-editor.c:953
 msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1311
+#: ../src/mail/em-subscription-editor.c:1313
+#: ../src/modules/mail/e-mail-shell-view-private.c:904
 #: ../src/modules/mail/e-mail-shell-view-private.c:936
-#: ../src/modules/mail/e-mail-shell-view-private.c:968
-#: ../src/modules/mail/e-mail-shell-view-private.c:1012
+#: ../src/modules/mail/e-mail-shell-view-private.c:980
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:1022
+#: ../src/mail/em-subscription-editor.c:1317
+#: ../src/modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../src/mail/em-subscription-editor.c:1727
+#: ../src/mail/em-subscription-editor.c:1729
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1762
+#: ../src/mail/em-subscription-editor.c:1764
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../src/mail/em-subscription-editor.c:1775
+#: ../src/mail/em-subscription-editor.c:1777
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../src/mail/em-subscription-editor.c:1792
+#: ../src/mail/em-subscription-editor.c:1794
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../src/mail/em-subscription-editor.c:1839
+#: ../src/mail/em-subscription-editor.c:1841
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../src/mail/em-subscription-editor.c:1840
+#: ../src/mail/em-subscription-editor.c:1842
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../src/mail/em-subscription-editor.c:1885
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/mail/em-subscription-editor.c:1887
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../src/mail/em-subscription-editor.c:1925
+#: ../src/mail/em-subscription-editor.c:1927
 msgid "Collapse all folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1926
+#: ../src/mail/em-subscription-editor.c:1928
 msgid "C_ollapse All"
 msgstr "Pienennä kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1936
+#: ../src/mail/em-subscription-editor.c:1938
 msgid "Expand all folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: ../src/mail/em-subscription-editor.c:1937
+#: ../src/mail/em-subscription-editor.c:1939
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../src/mail/em-subscription-editor.c:1947
+#: ../src/mail/em-subscription-editor.c:1949
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../src/mail/em-subscription-editor.c:1959
+#: ../src/mail/em-subscription-editor.c:1961
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
-#: ../src/mail/em-subscription-editor.c:1960
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Pysäytä"
 
@@ -18397,13 +18549,13 @@ msgstr[1] "Haluatko varmasti avata %d viestiä kerralla?"
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../src/mail/em-utils.c:1004
+#: ../src/mail/em-utils.c:1014
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
-#: ../src/mail/em-utils.c:1557
+#: ../src/mail/em-utils.c:1575
 #, fuzzy
 #| msgid "Redo"
 msgctxt "reply-attribution"
@@ -18411,12 +18563,12 @@ msgid "Re"
 msgstr "Tee uudelleen"
 
 #. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
-#: ../src/mail/em-utils.c:1560
+#: ../src/mail/em-utils.c:1578
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ""
 
-#: ../src/mail/em-utils.c:1846
+#: ../src/mail/em-utils.c:1878
 msgid "Deleting old messages"
 msgstr "Poistetaan vanhoja viestejä"
 
@@ -18424,35 +18576,35 @@ msgstr "Poistetaan vanhoja viestejä"
 msgid "Search _Folders"
 msgstr "_Hakukansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:393
+#: ../src/mail/em-vfolder-editor-rule.c:404
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
-#: ../src/mail/em-vfolder-editor-rule.c:522
+#: ../src/mail/em-vfolder-editor-rule.c:533
 msgid "Search Folder Sources"
 msgstr "Hakukansioiden lähteet"
 
-#: ../src/mail/em-vfolder-editor-rule.c:554
+#: ../src/mail/em-vfolder-editor-rule.c:565
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../src/mail/em-vfolder-editor-rule.c:566
+#: ../src/mail/em-vfolder-editor-rule.c:577
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:567
+#: ../src/mail/em-vfolder-editor-rule.c:578
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:568
+#: ../src/mail/em-vfolder-editor-rule.c:579
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:569
+#: ../src/mail/em-vfolder-editor-rule.c:580
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../src/mail/em-vfolder-editor-rule.c:607
+#: ../src/mail/em-vfolder-editor-rule.c:618
 msgid "include subfolders"
 msgstr "sisällytä alikansiot"
 
@@ -18609,7 +18761,7 @@ msgstr "Tärkeä"
 msgid "Read"
 msgstr "Luettu"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:137
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Roskaposti"
@@ -18821,7 +18973,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1043
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -18836,7 +18988,7 @@ 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/plugins/dbx-import/dbx-importer.c:605
+#: ../src/plugins/dbx-import/dbx-importer.c:612
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
 msgid "Importing “%s”"
@@ -18864,22 +19016,22 @@ msgstr "Tuo sähköpostit Pinestä."
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:268
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../src/mail/mail-autofilter.c:250
+#: ../src/mail/mail-autofilter.c:251
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../src/mail/mail-autofilter.c:290
+#: ../src/mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../src/mail/mail-autofilter.c:400
+#: ../src/mail/mail-autofilter.c:401
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
@@ -18888,7 +19040,7 @@ msgstr "Lisää suodatussääntö"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:551
+#: ../src/mail/mail-autofilter.c:552
 #, fuzzy, c-format
 #| msgid ""
 #| "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -18912,7 +19064,7 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio\n"
 "”%s”."
 
-#: ../src/mail/mail-autofilter.c:559
+#: ../src/mail/mail-autofilter.c:560
 #, fuzzy
 #| msgid "Message Filters"
 msgid "Open Message Filters"
@@ -19197,7 +19349,7 @@ msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
 #: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Pick a color"
 msgstr "Valitse väri"
 
@@ -19319,50 +19471,60 @@ msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
 #: ../src/mail/mail-config.ui.h:126
+#, fuzzy
+#| msgid "Show deleted messages in the message-list"
+msgid "Show _full mail addresses in message preview"
+msgstr "Näytä poistetut viestit viestiluettelossa"
+
+#: ../src/mail/mail-config.ui.h:127
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:128
+msgid "Re_set"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:129
 #: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:132
 msgid "_Delete junk messages"
 msgstr "Poista roskapostivi_estit"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:133
 msgid "Junk Test Options"
 msgstr "Roskapostitestaus"
 
-#: ../src/mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:134
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Älä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:136
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:138
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:139
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../src/mail/mail-config.ui.h:138
+#: ../src/mail/mail-config.ui.h:140
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -19419,31 +19581,35 @@ msgid "_Due By:"
 msgstr "_Erääntyy:"
 
 #. Translators: Flag Completed
-#: ../src/mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:17
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../src/mail/mail-dialogs.ui.h:19
+#: ../src/mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../src/mail/mail-dialogs.ui.h:21
+#: ../src/mail/mail-dialogs.ui.h:19
+msgid "_No"
+msgstr "_Ei"
+
+#: ../src/mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "_Hyväksy lisenssi"
 
-#: ../src/mail/mail-dialogs.ui.h:22
+#: ../src/mail/mail-dialogs.ui.h:21
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../src/mail/mail-dialogs.ui.h:23
+#: ../src/mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../src/mail/mail-dialogs.ui.h:25
+#: ../src/mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Digitaalinen allekirjoitus"
 
-#: ../src/mail/mail-dialogs.ui.h:26
+#: ../src/mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Salaus"
 
@@ -19646,7 +19812,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:1629
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1454
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -20187,7 +20353,6 @@ msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
 #: ../src/mail/mail.error.xml.h:169
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to connect account “{0}”."
 msgstr "Yhteys tiliin “{0}” epäonnistui."
 
@@ -20371,7 +20536,7 @@ msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:212
@@ -20382,7 +20547,7 @@ msgstr ""
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again by "
 "moving to another signature and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
 
 #: ../src/mail/mail.error.xml.h:214
@@ -20411,54 +20576,54 @@ msgstr "_Ei roskapostia"
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../src/mail/mail-send-recv.c:193
+#: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../src/mail/mail-send-recv.c:581
+#: ../src/mail/mail-send-recv.c:580
 msgid "Edit Message"
 msgstr "Muokkaa viestiä"
 
-#: ../src/mail/mail-send-recv.c:586
+#: ../src/mail/mail-send-recv.c:585
 #, fuzzy
 #| msgid "Move to Folder"
 msgid "Open Outbox Folder"
 msgstr "Siirrä kansioon"
 
-#: ../src/mail/mail-send-recv.c:760
+#: ../src/mail/mail-send-recv.c:738
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../src/mail/mail-send-recv.c:774
+#: ../src/mail/mail-send-recv.c:752
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:1396
+#: ../src/mail/mail-send-recv.c:841 ../src/mail/mail-send-recv.c:1372
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:946
+#: ../src/mail/mail-send-recv.c:841 ../src/mail/mail-send-recv.c:922
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../src/mail/mail-send-recv.c:1362
+#: ../src/mail/mail-send-recv.c:1338
 #, fuzzy, c-format
 #| msgid "Checking for new mail at '%s'"
 msgid "Checking for new mail at “%s”"
 msgstr "Tarkistetaan onko uusia viestejä palvelusta '%s'"
 
-#: ../src/mail/mail-send-recv.c:1589
+#: ../src/mail/mail-send-recv.c:1565
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../src/mail/mail-send-recv.c:1591
+#: ../src/mail/mail-send-recv.c:1567
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../src/mail/mail-send-recv.c:1593
+#: ../src/mail/mail-send-recv.c:1569
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at “%s”"
@@ -20476,94 +20641,94 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:306
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:307
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:308
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:309
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:310
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:311
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../src/mail/message-list.c:323
+#: ../src/mail/message-list.c:324
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:325
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../src/mail/message-list.c:328
+#: ../src/mail/message-list.c:329
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:330
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../src/mail/message-list.c:478 ../src/mail/message-list.c:6508
+#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6751
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2117 ../src/modules/itip-formatter/itip-view.c:268
+#: ../src/mail/message-list.c:2120 ../src/modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../src/mail/message-list.c:2126
+#: ../src/mail/message-list.c:2129
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../src/mail/message-list.c:2138
+#: ../src/mail/message-list.c:2141
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../src/mail/message-list.c:2146
+#: ../src/mail/message-list.c:2149
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../src/mail/message-list.c:2148
+#: ../src/mail/message-list.c:2151
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3178
+#: ../src/mail/message-list.c:3191
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../src/mail/message-list.c:3923 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3936 ../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:5387
+#: ../src/mail/message-list.c:5400
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/message-list.c:6447
+#: ../src/mail/message-list.c:6690
 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:6455
+#: ../src/mail/message-list.c:6698
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -20624,42 +20789,40 @@ 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:2177
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2170
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2191
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2184
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
 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:2156
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1965
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
 msgstr "Lauseke"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:275
-#, fuzzy
-#| msgid "Edit Location"
 msgid "Edit Collection"
-msgstr "Muokkaa sijaintia"
+msgstr "Muokkaa kokoelmaa"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:312
 #, fuzzy
@@ -20677,34 +20840,34 @@ msgid "C_alendar"
 msgstr "K_alenteri"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:476
-#: ../src/modules/addressbook/e-book-shell-backend.c:262
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+#: ../src/modules/addressbook/e-book-shell-backend.c:269
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:139
 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:284
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:326
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:532
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:536
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:540
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:544
-#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+#: ../src/modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
@@ -20732,7 +20895,7 @@ msgstr ""
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../src/modules/addressbook/autocompletion-config.c:124
-#: ../src/modules/mail/em-mailer-prefs.c:1568
+#: ../src/modules/mail/em-mailer-prefs.c:1696
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
@@ -20786,312 +20949,324 @@ msgstr "Yhteystiedot"
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:271
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:273
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1129
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:278
+#: ../src/modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:280
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
+#: ../src/modules/addressbook/e-book-shell-backend.c:287
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1136
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:288
+#: ../src/modules/addressbook/e-book-shell-backend.c:295
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:290
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
+#: ../src/modules/addressbook/e-book-shell-backend.c:297
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
 #. Translators: This is a save dialog title
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:607
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopioi valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "D_elete Address Book"
 msgstr "_Poista osoitekirja"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Manage Address Book groups..."
 msgstr "_Hallitse osoitekirjan ryhmiä..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-task-shell-view-actions.c:735
 msgid "Manage task list groups order and visibility"
 msgstr ""
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:963
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrä kaikki yhteystiedot..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move the contacts of the selected address book to another"
 msgstr "Siirrä valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:984
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
-#: ../src/modules/calendar/e-task-shell-view-actions.c:738
+#: ../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
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "Refresh the selected address book"
 msgstr "Päivitä valittu osoitekirja"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
+#, fuzzy
+#| msgid "Refresh the selected address book"
+msgid "Re_fresh list of account address books"
+msgstr "Päivitä valittu osoitekirja"
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
 #, fuzzy
 msgid "Address Book _Map"
 msgstr "Osoitekirja"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1073
 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:998
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
-#: ../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:1728
+#: ../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:1553
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
 msgid "Rename the selected address book"
 msgstr "Nimeä valittu osoitekirja uudestaan"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
 msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
 msgid "_Find in Contact..."
 msgstr "_Etsi yhteystiedosta..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../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:1033
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../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:1040
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1120
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../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:1047
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1127
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1054
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "_Open Contact"
 msgstr "_Avaa yhteystieto"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti henkilölle..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../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:1077
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../src/modules/calendar/e-task-shell-view-actions.c:810
+#: ../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
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
-#: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
+#: ../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:1702
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1097
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:680
-#: ../src/modules/calendar/e-task-shell-view-actions.c:834
+#: ../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/addressbook/e-book-shell-view-actions.c:1109
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
 msgid "Address Book Map"
 msgstr "Osoitekirjakartta"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1227
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Show _Maps"
 msgstr "Näytä _kartat"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
 #, fuzzy
 msgid "Show maps in contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:741
-#: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../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:1860
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1256
 msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:748
-#: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../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:1867
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1263
 msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1194
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:765
-#: ../src/modules/calendar/e-task-shell-view-actions.c:966
+#: ../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
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1204
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
-#: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
-#: ../src/shell/e-shell-content.c:637
+#: ../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:1951
+#: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1321
 msgid "Print all shown contacts"
 msgstr "Tulosta kaikki näytettävät yhteystiedot"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1328
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1335
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1350
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1352
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
 #. Translators: This is an action label
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1274
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1284
+#: ../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..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:311
+#: ../src/modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:353
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:344
+#: ../src/modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:388
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
+#: ../src/modules/alarm-notify/alarm-notify.c:169
+#, fuzzy, c-format
+#| msgid "Failed to open calendar “{0}”"
+msgid "Failed to launch command “%s”:"
+msgstr "Kalenterin “{0}” avaus epäonnistui"
+
 #: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
@@ -21338,8 +21513,34 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr ""
 
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:93
+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:293
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:309
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:274
+msgid "Find Address Books"
+msgstr "Etsi osoitekirjoja"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:285
+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:425
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
+
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1045
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
@@ -21356,7 +21557,7 @@ msgid "Standard LDAP Port"
 msgstr "Standardi LDAP_portti"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP SSL/TLS:n yli (vanhennettu)"
 
@@ -21369,100 +21570,106 @@ msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog SSL/TLS:n yli"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:636
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:663
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
 msgid "Port number is not valid"
 msgstr "Portin numero ei ole kelvollinen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:686
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:688
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:735
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+#, fuzzy
+#| msgid "User name cannot be empty"
+msgid "Username can be left empty"
+msgstr "Käyttäjätunnus ei voi olla tyhjä"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+msgid "requires anonymous access to your LDAP server"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+msgid "for example: uid=user,dc=example,dc=com"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Method:"
 msgstr "Menetelmä:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
-#, fuzzy
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you.  Note that setting "
-#| "this to \"Email Address\" requires anonymous access to your LDAP server."
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that setting this "
-"to “Using email address” requires anonymous access to your LDAP server."
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+msgid "This is the method Evolution will use to authenticate you."
 msgstr ""
-"Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että "
-"asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
-"palvelimellesi."
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:780
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
 #: ../src/modules/mail/e-mail-shell-view.c:118
+#: ../src/modules/mail/e-mail-shell-view.c:200
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:802
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:806
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
 #, fuzzy
 #| msgid "_Find Possible Search Bases"
 msgid "Find Possible Search Bases"
 msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
 msgid "One Level"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
 msgid "Subtree"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:832
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:837
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend down the "
@@ -21479,56 +21686,32 @@ msgstr ""
 "Kattavuus \"Ali\" kattaa kaikki kentät hakupohjasi alla ja sen alipuissa, kun taas "
 "kattavuus \"Yksi\" kattaa kentät yhden tason hakupohjastasi alaspäin."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:846
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
 msgid "Limit:"
 msgstr "Raja:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:890
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
 msgid "contacts"
 msgstr "yhteystietoa"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:895
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
 msgid "Browse until limit is reached"
 msgstr "Selaa kunnes raja tulee vastaan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1030
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
 msgid "Server address cannot be empty"
 msgstr "Palvelimen osoite ei voi olla tyhjä"
 
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
-msgid "Choose an Address Book"
-msgstr "Valitse osoitekirja"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
-msgid "URL:"
-msgstr "URL:"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
-msgid "Find Address Books"
-msgstr "Etsi osoitekirjoja"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
-msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
-msgid "URL is not a valid http:// nor https:// URL"
-msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
-
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
@@ -21544,27 +21727,27 @@ msgstr "Valitse muistilappulista"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:325
 msgid "Find Calendars"
 msgstr "Etsi kalentereja"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:328
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:331
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:350
 msgid "Email:"
 msgstr "Sähköposti_"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
@@ -21617,6 +21800,12 @@ msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "Oletukset"
 
+#: ../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
+msgid "Location:"
+msgstr "Sijainti:"
+
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
@@ -21695,91 +21884,91 @@ msgstr "_Tuo tehtäviin"
 msgid "I_mport to Task List"
 msgstr "_Tuo tehtäviin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:558
 #, 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:564
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:559
 #, 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:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
 #, 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:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:565
 #, 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:575
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, 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:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:571
 #, 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:693
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:688
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:523
+#: ../src/modules/calendar/e-calendar-preferences.c:524
 #, 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:530
+#: ../src/modules/calendar/e-calendar-preferences.c:531
 msgid "Selected Memo Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:537
+#: ../src/modules/calendar/e-calendar-preferences.c:538
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:633
+#: ../src/modules/calendar/e-calendar-preferences.c:634
 msgid "Meeting Invitations"
 msgstr "Kokouskutsut"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:660
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:673
-#: ../src/modules/calendar/e-calendar-preferences.c:704
+#: ../src/modules/calendar/e-calendar-preferences.c:674
+#: ../src/modules/calendar/e-calendar-preferences.c:705
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:688
+#: ../src/modules/calendar/e-calendar-preferences.c:689
 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:1114
+#: ../src/modules/calendar/e-calendar-preferences.c:1123
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1115
+#: ../src/modules/calendar/e-calendar-preferences.c:1124
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -21844,7 +22033,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:1658
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
 msgid "Work Week"
 msgstr "Työviikko"
 
@@ -21969,147 +22158,151 @@ msgid "Order days in Week View from _left to right"
 msgstr ""
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Allo_w direct edit of event Summary"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Alerts"
 msgstr "Hälytykset"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Display"
 msgstr "Näytä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight t_asks due today"
 msgstr "Korosta _tänään erääntyvät tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Highlight _overdue tasks"
 msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+msgid "Hid_e cancelled tasks"
+msgstr "Piilota _perutut tehtävät"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 #, fuzzy
 #| msgid "_To Do"
 msgid "To Do bar"
 msgstr "Te_htävää"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Show Tasks without _Due date"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Display reminders in _notification area only"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 #, fuzzy
 #| msgid "Display reminders in _notification area only"
 msgid "Keep reminder notification _window always on top"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Display reminders for completed _tasks"
 msgstr "Poista muistutukset _valmistuneista tehtävistä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Display reminders for _past events"
 msgstr "Näytä _muistutukset menneistä tapahtumista"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Set _default reminder"
 msgstr "_Aseta oletusmuistutus"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 msgid "before every new appointment"
 msgstr "ennen jokaista uutta tapaamista"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 msgid "Show a _reminder"
 msgstr "Näytä _muistutus"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-msgid "Default _snooze time (in minutes)"
-msgstr "Oletus_torkkuaika (minuuteissa)"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 #, fuzzy
 #| msgid "Select the calendars for reminder notification"
 msgid "Select the sources for reminder notification:"
 msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../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:90
+#: ../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:91
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 msgid "Publishing Information"
 msgstr "Julkaisutiedot"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:113
+#: ../src/modules/calendar/e-cal-shell-backend.c:115
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../src/modules/calendar/e-cal-shell-backend.c:117
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-backend.c:122
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:124
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:127
+#: ../src/modules/calendar/e-cal-shell-backend.c:129
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:131
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:137
+#: ../src/modules/calendar/e-cal-shell-backend.c:139
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
-
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+
+#: ../src/modules/calendar/e-cal-shell-backend.c:141
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:256
+#: ../src/modules/calendar/e-cal-shell-backend.c:258
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:314
 msgid ""
 "This operation will permanently erase all events older than the selected amount of "
 "time. If you continue, you will not be able to recover these events."
@@ -22119,11 +22312,11 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:940
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -22131,369 +22324,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:1124
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1140
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../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:496
-#: ../src/modules/calendar/e-task-shell-view-actions.c:615
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:512
+#: ../src/modules/calendar/e-task-shell-view-actions.c:631
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1260
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
-#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+#: ../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:1267
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../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:1304
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Manage Calendar groups order and visibility"
 msgstr "Hallitse kalenteriryhmien järjestystä ja näkyvyyttä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
-#: ../src/modules/calendar/e-task-shell-view-actions.c:801
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#, 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
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi hakuehdon seuraava esiintymä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi hakuehdon edellinen esiintymä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Sho_w All Calendars"
 msgstr "Näytä _kaikki kalenterit"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../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:1386
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../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:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
 #, fuzzy
 #| msgid "View the current appointment"
 msgid "Edit the current appointment as new"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../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:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../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:570
-#: ../src/modules/calendar/e-task-shell-view-actions.c:696
+#: ../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:1437
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../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:1456
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
-msgid "_Reply"
-msgstr "_Vastaa"
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../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:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../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:1493
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "Day"
 msgstr "Päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "List"
 msgstr "Lista"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Week"
 msgstr "Viikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1687
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Next 7 Days’ Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1720
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:789
-#: ../src/modules/calendar/e-task-shell-view-actions.c:990
+#: ../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
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:796
-#: ../src/modules/calendar/e-task-shell-view-actions.c:997
+#: ../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
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1751
+#: ../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:806
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
+#: ../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:1739
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1768
+#: ../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:837
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
+#: ../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:1845
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
 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:494
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
 msgid "memo"
 msgstr "muistilappu"
 
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
 #: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:665
 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:647
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
 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:649
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:672
 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:654
-#: ../src/modules/calendar/e-task-shell-view-actions.c:794
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:677
+#: ../src/modules/calendar/e-task-shell-view-actions.c:817
 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:822
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:849
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:811
+#: ../src/modules/calendar/e-cal-shell-view-private.c:885
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:812
+#: ../src/modules/calendar/e-cal-shell-view-private.c:886
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:833
+#: ../src/modules/calendar/e-cal-shell-view-private.c:907
 #, 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:837
+#: ../src/modules/calendar/e-cal-shell-view-private.c:911
 #, 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:860
+#: ../src/modules/calendar/e-cal-shell-view-private.c:934
 msgid "Cannot search with no active calendar"
 msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
@@ -22502,22 +22697,22 @@ msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 #. 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:613
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
 msgid "task"
 msgstr "tehtävä"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:691
 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:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 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:768
+#: ../src/modules/calendar/e-task-shell-view-actions.c:791
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
@@ -22526,33 +22721,33 @@ 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:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:798
 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:780
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
 #: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:805
 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:787
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 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:789
+#: ../src/modules/calendar/e-task-shell-view-actions.c:812
 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:1023
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1057
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
@@ -22576,106 +22771,112 @@ 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:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:196
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
+#: ../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:565
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:581
 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:584
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "D_elete Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Delete the selected memo list"
 msgstr "Poista valittu muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+#: ../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:593
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:609
 msgid "Manage Memo List groups order and visibility"
 msgstr ""
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:630
 msgid "Refresh the selected memo list"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:635
+#, 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
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:656
 #, 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:720
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:770
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:777
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:835
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:842
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
-#: ../src/modules/calendar/e-memo-shell-view.c:217
+#: ../src/modules/calendar/e-memo-shell-view.c:227
 msgid "Delete Memos"
 msgstr "Poista muistilaput"
 
-#: ../src/modules/calendar/e-memo-shell-view.c:219
+#: ../src/modules/calendar/e-memo-shell-view.c:229
 msgid "Delete Memo"
 msgstr "Poista muistilappu"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:367
+#: ../src/modules/calendar/e-memo-shell-view-private.c:361
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:371
-#: ../src/modules/calendar/e-task-shell-view-private.c:548
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:577
 #, c-format
 msgid "%d selected"
 msgstr ", %d valittu"
@@ -22700,16 +22901,16 @@ 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:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:742
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view-actions.c:220
+#: ../src/modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:557
+#: ../src/modules/calendar/e-task-shell-view-actions.c:573
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -22721,140 +22922,146 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:564
+#: ../src/modules/calendar/e-task-shell-view-actions.c:580
 msgid "Do not ask me again"
 msgstr "Älä kysy uudestaan"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:682
+#: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:689
+#: ../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:691
+#: ../src/modules/calendar/e-task-shell-view-actions.c:707
 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:710
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "D_elete Task List"
 msgstr "_Poista tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/modules/calendar/e-task-shell-view-actions.c:728
 msgid "Delete the selected task list"
 msgstr "Poista valittu tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+#: ../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:724
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:756
 msgid "Refresh the selected task list"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
+#: ../src/modules/calendar/e-task-shell-view-actions.c:761
+#, 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
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:752
+#: ../src/modules/calendar/e-task-shell-view-actions.c:775
 #, 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:759
+#: ../src/modules/calendar/e-task-shell-view-actions.c:782
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-task-shell-view-actions.c:826
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:886
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:888
+#: ../src/modules/calendar/e-task-shell-view-actions.c:915
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:909
+#: ../src/modules/calendar/e-task-shell-view-actions.c:936
 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:916
+#: ../src/modules/calendar/e-task-shell-view-actions.c:943
 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:924
+#: ../src/modules/calendar/e-task-shell-view-actions.c:951
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:938
+#: ../src/modules/calendar/e-task-shell-view-actions.c:965
+msgid "Cancelled Tasks"
+msgstr "Perutut tehtävät"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:972
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+#: ../src/modules/calendar/e-task-shell-view-actions.c:979
 msgid "Next 7 Days’ Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:952
+#: ../src/modules/calendar/e-task-shell-view-actions.c:986
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:959
+#: ../src/modules/calendar/e-task-shell-view-actions.c:993
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:321
+#: ../src/modules/calendar/e-task-shell-view.c:345
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:323
+#: ../src/modules/calendar/e-task-shell-view.c:347
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:544
+#: ../src/modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:324
-#, fuzzy
-#| msgid "Create a _Meeting"
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:331
 msgid "Convert to M_eeting"
-msgstr "Luo _kokous"
+msgstr "Muunna _kokoukseksi"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:333
 #, 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
-#, fuzzy
-#| msgid "Important Messages"
 msgid "Convert to M_essage"
-msgstr "Tärkeät viestit"
+msgstr "Muunna _viestiksi"
 
 #: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
 #, fuzzy
@@ -22863,23 +23070,20 @@ msgid "Convert to the mail message"
 msgstr "Kirjoita uusi viesti"
 
 #: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
-msgid "Look up e-mail domain on the GNOME server"
+msgid "Look up configuration with e-mail domain"
 msgstr ""
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
-#| msgid "IMAP server"
 msgid "Looking up IMAP server…"
 msgstr "Etsitään IMAP-palvelinta…"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
-#| msgid "POP3 server"
 msgid "Looking up POP3 server…"
 msgstr "Etsitään POP3-palvelinta…"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
-#| msgid "SMTP server"
 msgid "Looking up SMTP server…"
 msgstr "Etsitään SMTP-palvelinta…"
 
@@ -22891,7 +23095,6 @@ msgstr "CalDAV-palvelin"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:87
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:88
-#| msgid "CalDAV server"
 msgid "Looking up CalDAV server…"
 msgstr "Etsitään CalDAV-palvelinta…"
 
@@ -22903,7 +23106,6 @@ msgstr "CardDAV-palvelin"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:89
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:90
-#| msgid "CardDAV server"
 msgid "Looking up CardDAV server…"
 msgstr "Etsitään CardDAV-palvelinta…"
 
@@ -22914,7 +23116,6 @@ msgstr "LDAP-palvelin"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:91
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:92
-#| msgid "LDAP server"
 msgid "Looking up LDAP server…"
 msgstr "Etsitään LDAP-palvelinta…"
 
@@ -22924,18 +23125,15 @@ msgstr "Etsitään SRV-tietueita"
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
 #, c-format
-#| msgid "CalDAV server"
 msgid "CalDAV: %s"
 msgstr "CalDAV: %s"
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
 #, c-format
-#| msgid "CardDAV server"
 msgid "CardDAV: %s"
 msgstr "CardDAV: %s"
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:117
-#| msgid "CardDAV server"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV- ja CardDAV-palvelin"
 
@@ -22943,496 +23141,496 @@ msgstr "CalDAV- ja CardDAV-palvelin"
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "Etsi CalDAV-/CardDAV-palvelinta"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
 msgid "Display part as an invitation"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:259
+#: ../src/modules/itip-formatter/itip-view.c:260
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:263
+#: ../src/modules/itip-formatter/itip-view.c:264
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:272
+#: ../src/modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:287
+#: ../src/modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:291
+#: ../src/modules/itip-formatter/itip-view.c:292
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:296
+#: ../src/modules/itip-formatter/itip-view.c:297
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:300
+#: ../src/modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:319
+#: ../src/modules/itip-formatter/itip-view.c:320
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:324
+#: ../src/modules/itip-formatter/itip-view.c:325
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:328
+#: ../src/modules/itip-formatter/itip-view.c:329
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:333
+#: ../src/modules/itip-formatter/itip-view.c:334
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:337
+#: ../src/modules/itip-formatter/itip-view.c:338
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:346
+#: ../src/modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e"
 msgstr "+%Ana %e. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:352
+#: ../src/modules/itip-formatter/itip-view.c:353
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %e. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:356
+#: ../src/modules/itip-formatter/itip-view.c:357
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %e. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:361
+#: ../src/modules/itip-formatter/itip-view.c:362
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %e. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:365
+#: ../src/modules/itip-formatter/itip-view.c:366
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %e. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:371
+#: ../src/modules/itip-formatter/itip-view.c:372
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %e. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:376
+#: ../src/modules/itip-formatter/itip-view.c:377
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %e. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:380
+#: ../src/modules/itip-formatter/itip-view.c:381
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %e. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:385
+#: ../src/modules/itip-formatter/itip-view.c:386
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:389
+#: ../src/modules/itip-formatter/itip-view.c:390
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
-#: ../src/modules/itip-formatter/itip-view.c:427
 #: ../src/modules/itip-formatter/itip-view.c:428
-#: ../src/modules/itip-formatter/itip-view.c:517
+#: ../src/modules/itip-formatter/itip-view.c:429
 #: ../src/modules/itip-formatter/itip-view.c:518
-#: ../src/modules/itip-formatter/itip-view.c:607
+#: ../src/modules/itip-formatter/itip-view.c:519
+#: ../src/modules/itip-formatter/itip-view.c:608
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../src/modules/itip-formatter/itip-view.c:432
-#: ../src/modules/itip-formatter/itip-view.c:522
-#: ../src/modules/itip-formatter/itip-view.c:611
+#: ../src/modules/itip-formatter/itip-view.c:433
+#: ../src/modules/itip-formatter/itip-view.c:523
+#: ../src/modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:434
-#: ../src/modules/itip-formatter/itip-view.c:524
-#: ../src/modules/itip-formatter/itip-view.c:613
+#: ../src/modules/itip-formatter/itip-view.c:435
+#: ../src/modules/itip-formatter/itip-view.c:525
+#: ../src/modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:439
+#: ../src/modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:441
+#: ../src/modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../src/modules/itip-formatter/itip-view.c:446
+#: ../src/modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../src/modules/itip-formatter/itip-view.c:449
+#: ../src/modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:451
+#: ../src/modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../src/modules/itip-formatter/itip-view.c:457
+#: ../src/modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:459
+#: ../src/modules/itip-formatter/itip-view.c:460
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:463
+#: ../src/modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:469
+#: ../src/modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:472
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:475
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following meeting:"
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s perui seuraavan kokouksen %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:477
+#: ../src/modules/itip-formatter/itip-view.c:478
 #, fuzzy, c-format
 #| msgid "%s has canceled the following meeting:"
 msgid "%s has cancelled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:481
+#: ../src/modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../src/modules/itip-formatter/itip-view.c:483
+#: ../src/modules/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:487
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:489
+#: ../src/modules/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../src/modules/itip-formatter/itip-view.c:529
+#: ../src/modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:531
+#: ../src/modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:536
+#: ../src/modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:539
+#: ../src/modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:541
+#: ../src/modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../src/modules/itip-formatter/itip-view.c:547
+#: ../src/modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:549
+#: ../src/modules/itip-formatter/itip-view.c:550
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:553
+#: ../src/modules/itip-formatter/itip-view.c:554
 #, 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:555
+#: ../src/modules/itip-formatter/itip-view.c:556
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:559
+#: ../src/modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:562
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../src/modules/itip-formatter/itip-view.c:565
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following assigned task:"
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:567
+#: ../src/modules/itip-formatter/itip-view.c:568
 #, fuzzy, c-format
 #| msgid "%s has canceled the following assigned task:"
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän:"
 
-#: ../src/modules/itip-formatter/itip-view.c:571
+#: ../src/modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:573
+#: ../src/modules/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../src/modules/itip-formatter/itip-view.c:577
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:579
+#: ../src/modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:618
+#: ../src/modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:620
+#: ../src/modules/itip-formatter/itip-view.c:621
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:625
+#: ../src/modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:627
+#: ../src/modules/itip-formatter/itip-view.c:628
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:631
+#: ../src/modules/itip-formatter/itip-view.c:632
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following shared memo:"
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../src/modules/itip-formatter/itip-view.c:633
+#: ../src/modules/itip-formatter/itip-view.c:634
 #, fuzzy, c-format
 #| msgid "%s has canceled the following shared memo:"
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s on perunut seuraavan jaetun muistilapun:"
 
-#: ../src/modules/itip-formatter/itip-view.c:858
+#: ../src/modules/itip-formatter/itip-view.c:859
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:865
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:864
-#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:1683
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:874
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:873
-#: ../src/modules/itip-formatter/itip-view.c:1683
+#: ../src/modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:1684
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1214
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1217
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1220
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1223
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1226
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1229
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1232
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1235
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/modules/itip-formatter/itip-view.c:1238
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../src/modules/itip-formatter/itip-view.c:1240
+#: ../src/modules/itip-formatter/itip-view.c:1241
 #: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1733
-#: ../src/modules/itip-formatter/itip-view.c:1804
+#: ../src/modules/itip-formatter/itip-view.c:1686
+#: ../src/modules/itip-formatter/itip-view.c:1734
+#: ../src/modules/itip-formatter/itip-view.c:1805
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1721
+#: ../src/modules/itip-formatter/itip-view.c:1722
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1739
+#: ../src/modules/itip-formatter/itip-view.c:1740
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1741
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../src/modules/itip-formatter/itip-view.c:1741
+#: ../src/modules/itip-formatter/itip-view.c:1742
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:1742
+#: ../src/modules/itip-formatter/itip-view.c:1743
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:2051
+#: ../src/modules/itip-formatter/itip-view.c:2052
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2054
+#: ../src/modules/itip-formatter/itip-view.c:2055
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3111
+#: ../src/modules/itip-formatter/itip-view.c:3112
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../src/modules/itip-formatter/itip-view.c:3633
-#: ../src/modules/itip-formatter/itip-view.c:5189
+#: ../src/modules/itip-formatter/itip-view.c:3634
+#: ../src/modules/itip-formatter/itip-view.c:5199
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:3848
+#: ../src/modules/itip-formatter/itip-view.c:3849
 #, 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:3854
+#: ../src/modules/itip-formatter/itip-view.c:3855
 #, 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"
@@ -23443,153 +23641,153 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3887
+#: ../src/modules/itip-formatter/itip-view.c:3888
 #, 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:3896
+#: ../src/modules/itip-formatter/itip-view.c:3897
 #, 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:4038
+#: ../src/modules/itip-formatter/itip-view.c:4039
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:4046
+#: ../src/modules/itip-formatter/itip-view.c:4047
 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:4051
+#: ../src/modules/itip-formatter/itip-view.c:4052
 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:4056
+#: ../src/modules/itip-formatter/itip-view.c:4057
 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:4397
+#: ../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:4402
+#: ../src/modules/itip-formatter/itip-view.c:4403
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4801
+#: ../src/modules/itip-formatter/itip-view.c:4811
 #, 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:4816
+#: ../src/modules/itip-formatter/itip-view.c:4826
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4821
+#: ../src/modules/itip-formatter/itip-view.c:4831
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:4827
+#: ../src/modules/itip-formatter/itip-view.c:4837
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to calendar “%s” as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:4833
+#: ../src/modules/itip-formatter/itip-view.c:4843
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4869
-#: ../src/modules/itip-formatter/itip-view.c:5326
-#: ../src/modules/itip-formatter/itip-view.c:5429
+#: ../src/modules/itip-formatter/itip-view.c:4879
+#: ../src/modules/itip-formatter/itip-view.c:5336
+#: ../src/modules/itip-formatter/itip-view.c:5439
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4921
+#: ../src/modules/itip-formatter/itip-view.c:4931
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5113
+#: ../src/modules/itip-formatter/itip-view.c:5123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5130
+#: ../src/modules/itip-formatter/itip-view.c:5140
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5134
+#: ../src/modules/itip-formatter/itip-view.c:5144
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5181
+#: ../src/modules/itip-formatter/itip-view.c:5191
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5216
+#: ../src/modules/itip-formatter/itip-view.c:5226
 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:5291
+#: ../src/modules/itip-formatter/itip-view.c:5301
 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:5362
-#: ../src/modules/itip-formatter/itip-view.c:5400
+#: ../src/modules/itip-formatter/itip-view.c:5372
+#: ../src/modules/itip-formatter/itip-view.c:5410
 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:5461
+#: ../src/modules/itip-formatter/itip-view.c:5471
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5466
+#: ../src/modules/itip-formatter/itip-view.c:5476
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5471
+#: ../src/modules/itip-formatter/itip-view.c:5481
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5482
+#: ../src/modules/itip-formatter/itip-view.c:5492
 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:5487
+#: ../src/modules/itip-formatter/itip-view.c:5497
 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:5492
+#: ../src/modules/itip-formatter/itip-view.c:5502
 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:5557
+#: ../src/modules/itip-formatter/itip-view.c:5567
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5562
+#: ../src/modules/itip-formatter/itip-view.c:5572
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:5611
-#: ../src/modules/itip-formatter/itip-view.c:5624
+#: ../src/modules/itip-formatter/itip-view.c:5621
+#: ../src/modules/itip-formatter/itip-view.c:5634
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5612
-#: ../src/modules/itip-formatter/itip-view.c:5625
+#: ../src/modules/itip-formatter/itip-view.c:5622
+#: ../src/modules/itip-formatter/itip-view.c:5635
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23597,15 +23795,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../src/modules/itip-formatter/itip-view.c:5667
-#: ../src/modules/itip-formatter/itip-view.c:5748
-#: ../src/modules/itip-formatter/itip-view.c:5844
+#: ../src/modules/itip-formatter/itip-view.c:5677
+#: ../src/modules/itip-formatter/itip-view.c:5758
+#: ../src/modules/itip-formatter/itip-view.c:5854
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5668
-#: ../src/modules/itip-formatter/itip-view.c:5749
-#: ../src/modules/itip-formatter/itip-view.c:5845
+#: ../src/modules/itip-formatter/itip-view.c:5678
+#: ../src/modules/itip-formatter/itip-view.c:5759
+#: ../src/modules/itip-formatter/itip-view.c:5855
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
@@ -23613,38 +23811,26 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä tai "
 "vapaa/varattu-tietoja."
 
-#: ../src/modules/itip-formatter/itip-view.c:5758
+#: ../src/modules/itip-formatter/itip-view.c:5768
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5759
+#: ../src/modules/itip-formatter/itip-view.c:5769
 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:6276
+#: ../src/modules/itip-formatter/itip-view.c:6307
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/itip-formatter/itip-view.c:6292
+#: ../src/modules/itip-formatter/itip-view.c:6323
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../src/modules/itip-formatter/itip-view.c:6460
-msgid "This meeting recurs"
-msgstr "Tapaaminen on toistuva"
-
-#: ../src/modules/itip-formatter/itip-view.c:6463
-msgid "This task recurs"
-msgstr "Tehtävä on toistuva"
-
-#: ../src/modules/itip-formatter/itip-view.c:6466
-msgid "This memo recurs"
-msgstr "Muistilappu on toistuva"
-
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Vastaus ei ole olemassa olevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
@@ -23779,7 +23965,8 @@ msgstr ""
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
+#: ../src/plugins/mail-notification/mail-notification.c:1220
 msgid "Configuration"
 msgstr "Asetukset"
 
@@ -23910,57 +24097,57 @@ 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:733
+#: ../src/modules/mail/e-mail-shell-backend.c:734
 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:736
+#: ../src/modules/mail/e-mail-shell-backend.c:737
 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:739
+#: ../src/modules/mail/e-mail-shell-backend.c:740
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:769
+#: ../src/modules/mail/e-mail-shell-backend.c:770
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:778
+#: ../src/modules/mail/e-mail-shell-backend.c:779
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:792
+#: ../src/modules/mail/e-mail-shell-backend.c:793
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:861
+#: ../src/modules/mail/e-mail-shell-backend.c:862
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:871
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:879
+#: ../src/modules/mail/e-mail-shell-backend.c:880
 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:1240
+#: ../src/modules/mail/e-mail-shell-backend.c:1241
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
@@ -23977,437 +24164,435 @@ msgstr "Siirry kansioon"
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1447
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1449
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1456
 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:1636
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1461
 #, fuzzy
 #| msgid "_Junk"
 msgid "Empty _Junk"
 msgstr "_Roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1463
 #, 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:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1470
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1477
 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:1657
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1482
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1484
 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:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1489
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1496
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1510
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1512
 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:1692
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1517
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1519
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1524
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1526
 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:1707
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1532
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1534
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1541
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1548
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1560
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1562
 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:1742
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1569
 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:1756
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1583
 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:1763
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1590
 #, 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:1770
-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/modules/mail/e-mail-shell-view-actions.c:1779
-msgid "N_one"
-msgstr "Ei _mitään"
-
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1604
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 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:1807
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1616
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
 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:1814
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
 #, 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:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1856
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1863
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
 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:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1686
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
-msgid "_Label"
-msgstr "_Merkintä"
-
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1712
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1917
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1962
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1990
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 #, 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:2006
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1808
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1810
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2014
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Show _Junk Messages"
 msgstr "Näytä _roskapostiviestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
 #, 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:2022
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1824
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1826
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1832
 #, fuzzy
 #| msgid "Show _Tool Bar"
 msgid "Show To _Do Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1840
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
 #, 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:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1862
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2075
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2082
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2089
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
 #, 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:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1905
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2124
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2131
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1933
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2138
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Message Thread"
 msgstr "Viestinketju"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2198
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2208
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2215
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2222
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../src/modules/mail/e-mail-shell-view.c:777
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
+#, fuzzy
+#| msgid "In Current Folder and _Subfolders"
+msgid "Current Folder and Subfolders"
+msgstr "Nykyisessä kansiossa ja alikan_sioissa"
+
+#: ../src/modules/mail/e-mail-shell-view.c:893
+#, 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
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view.c:885
+#: ../src/modules/mail/e-mail-shell-view.c:1121
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:929
+#: ../src/modules/mail/e-mail-shell-view-private.c:897
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:944
-#: ../src/modules/mail/e-mail-shell-view-private.c:961
+#: ../src/modules/mail/e-mail-shell-view-private.c:912
+#: ../src/modules/mail/e-mail-shell-view-private.c:929
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:975
-#: ../src/modules/mail/e-mail-shell-view-private.c:981
+#: ../src/modules/mail/e-mail-shell-view-private.c:943
+#: ../src/modules/mail/e-mail-shell-view-private.c:949
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:988
+#: ../src/modules/mail/e-mail-shell-view-private.c:956
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:994
+#: ../src/modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1000
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d lukematon"
 msgstr[1] "%d lukematonta"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1535
+#: ../src/modules/mail/e-mail-shell-view-private.c:1503
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
@@ -24460,20 +24645,20 @@ msgstr "Kerran kuussa"
 msgid "Immediately, on folder leave"
 msgstr ""
 
-#: ../src/modules/mail/em-mailer-prefs.c:418
+#: ../src/modules/mail/em-mailer-prefs.c:436
 msgid "Header"
 msgstr "Otsake"
 
-#: ../src/modules/mail/em-mailer-prefs.c:422
+#: ../src/modules/mail/em-mailer-prefs.c:440
 msgid "Contains Value"
 msgstr "Sisältää arvon"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1570
+#: ../src/modules/mail/em-mailer-prefs.c:1698
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1571
+#: ../src/modules/mail/em-mailer-prefs.c:1699
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
@@ -24542,28 +24727,28 @@ msgstr "Evolution palaa yhdistettyyn tilaan, kun verkko on taas käytettävissä
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
 msgid "Plugin Manager"
 msgstr "Lisäosien hallinta"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
 msgid "Plugin"
 msgstr "Lisäosa"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
 msgid "_Plugins"
 msgstr "_Lisäosat"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "Enable and disable plugins"
 msgstr "Käytä ja poista käytöstä lisäosia"
 
@@ -24745,11 +24930,11 @@ msgstr "_Muotoile..."
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:453
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:498
 msgid "Text Highlight"
 msgstr "Tekstin korostus"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:499
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
@@ -25000,7 +25185,7 @@ msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:570
-#: ../src/plugins/templates/templates.c:488
+#: ../src/plugins/templates/templates.c:487
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -25032,35 +25217,40 @@ msgstr "Liitemuistuttaja"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Muistuttaa, jos unohdit lisätä liitteen viestiin."
 
-#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/bbdb.c:756 ../src/plugins/bbdb/bbdb.c:879
 #: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../src/plugins/bbdb/bbdb.c:750
+#: ../src/plugins/bbdb/bbdb.c:771
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
-#: ../src/plugins/bbdb/bbdb.c:760
+#. File Under setting
+#: ../src/plugins/bbdb/bbdb.c:782
+msgid "Set File _under as “First Last”, instead of “Last, First”"
+msgstr ""
+
+#: ../src/plugins/bbdb/bbdb.c:793
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../src/plugins/bbdb/bbdb.c:780
+#: ../src/plugins/bbdb/bbdb.c:813
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:795
+#: ../src/plugins/bbdb/bbdb.c:828
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../src/plugins/bbdb/bbdb.c:805
+#: ../src/plugins/bbdb/bbdb.c:838
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:821
+#: ../src/plugins/bbdb/bbdb.c:854
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -25160,7 +25350,7 @@ msgid "Key"
 msgstr "Avaimet"
 
 #: ../src/plugins/email-custom-header/email-custom-header.c:877
-#: ../src/plugins/templates/templates.c:497
+#: ../src/plugins/templates/templates.c:496
 msgid "Values"
 msgstr "Arvot"
 
@@ -25470,8 +25660,7 @@ msgstr ""
 "Otsake: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:401
-#: ../src/plugins/mail-notification/mail-notification.c:437
+#: ../src/plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -25480,60 +25669,80 @@ msgstr[1] "%d uutta viestiä vastaanotettu."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:412
+#: ../src/plugins/mail-notification/mail-notification.c:471
 #, c-format
 msgid "From: %s"
 msgstr "Lähettäjä: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:426
+#: ../src/plugins/mail-notification/mail-notification.c:485
 #, c-format
 msgid "Subject: %s"
 msgstr "Aihe: %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:443
+#. Translators: %d is the count of mails received in addition
+#. * to the one displayed in this notification.
+#: ../src/plugins/mail-notification/mail-notification.c:501
+#, c-format
+msgid "(and %d more)"
+msgid_plural "(and %d more)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/plugins/mail-notification/mail-notification.c:513
 msgid "New email in Evolution"
 msgstr "Uusia sähköpostiviestejä Evolutionissa"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:483
+#: ../src/plugins/mail-notification/mail-notification.c:553
 #, c-format
 msgid "Show %s"
 msgstr "Näytä %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:687
+#: ../src/plugins/mail-notification/mail-notification.c:792
 msgid "_Play sound when a new message arrives"
 msgstr "_Soita ääni uuden sähköpostin saapuessa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:719
+#: ../src/plugins/mail-notification/mail-notification.c:824
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:732
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:751
+#: ../src/plugins/mail-notification/mail-notification.c:856
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:760
+#: ../src/plugins/mail-notification/mail-notification.c:865
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../src/plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:1014
+#, fuzzy
+#| msgid "Select the calendars for reminder notification"
+msgid "Select _accounts for which enable notifications:"
+msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
+
+#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Huomautus uusista viesteistä"
+
+#: ../src/plugins/mail-notification/mail-notification.c:1190
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../src/plugins/mail-notification/mail-notification.c:853
+#: ../src/plugins/mail-notification/mail-notification.c:1206
 msgid "Show _notification when a new message arrives"
 msgstr "Näytä ilmoitus uusien _viestien saapuessa"
 
-#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "Huomautus uusista viesteistä"
+#: ../src/plugins/mail-notification/mail-notification.c:1224
+msgid "Accounts"
+msgstr "Tilit"
 
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Notifies you when new mail messages arrive."
@@ -25721,6 +25930,12 @@ msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
 #: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+#| msgid "Mail to %s"
+msgid "Mail-to-Task"
+msgstr "Viesti %s:lle"
+
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Convert a mail message to a task."
 msgstr "Muunna valittu viesti tehtäväksi."
 
@@ -26024,18 +26239,14 @@ msgstr "_Tallenna nimellä"
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../src/plugins/save-calendar/save-calendar.c:380
+#: ../src/plugins/save-calendar/save-calendar.c:388
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../src/plugins/save-calendar/save-calendar.c:411
+#: ../src/plugins/save-calendar/save-calendar.c:427
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
-#: ../src/plugins/templates/e-templates-store.c:115
-msgid "No Title"
-msgstr "Ei otsikkoa"
-
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -26043,16 +26254,16 @@ msgid ""
 "email you are replying to."
 msgstr ""
 
-#: ../src/plugins/templates/templates.c:1299
+#: ../src/plugins/templates/templates.c:874
 #, fuzzy
 msgid "Saving message template"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../src/plugins/templates/templates.c:1320
+#: ../src/plugins/templates/templates.c:895
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../src/plugins/templates/templates.c:1322
+#: ../src/plugins/templates/templates.c:897
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
@@ -26072,35 +26283,31 @@ msgstr "Valmistellaan sulkemista"
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../src/shell/e-shell.c:926
+#: ../src/shell/e-shell.c:1074
 msgid "Open _Settings"
 msgstr "_Avaa asetukset"
 
-#: ../src/shell/e-shell.c:1127
+#: ../src/shell/e-shell.c:1281
 msgid "Credentials are required to connect to the destination host."
 msgstr "Tilitiedot vaaditaan etäpalvelimeen yhdistämiseksi."
 
-#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:866
+#: ../src/shell/e-shell.c:1448 ../src/shell/e-shell-window-actions.c:850
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../src/shell/e-shell.c:1308
-msgid "Quick _Reference"
-msgstr "_Pikaopas"
-
-#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
+#: ../src/shell/e-shell.c:1459 ../src/shell/e-shell-window-actions.c:780
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell.c:1460 ../src/shell/e-shell-window-actions.c:878
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
+#: ../src/shell/e-shell-content.c:702 ../src/shell/e-shell-content.c:703
 msgid "Searches"
 msgstr "Haut"
 
-#: ../src/shell/e-shell-content.c:744
+#: ../src/shell/e-shell-content.c:746
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -26135,7 +26342,7 @@ msgstr "Kaikki tiedostot (*)"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../src/shell/e-shell-utils.c:419
+#: ../src/shell/e-shell-utils.c:353
 msgid "translator-credits"
 msgstr ""
 "Jiri Grönroos, 2012-2017\n"
@@ -26163,11 +26370,11 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
 "  papukaija https://launchpad.net/~papukaija";
 
-#: ../src/shell/e-shell-utils.c:430
+#: ../src/shell/e-shell-utils.c:364
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../src/shell/e-shell-view.c:290
+#: ../src/shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Tallennetaan käyttöliittymän tilaa"
 
@@ -26175,276 +26382,268 @@ msgstr "Tallennetaan käyttöliittymän tilaa"
 msgid "Categories Editor"
 msgstr "Luokkamuokkain"
 
-#: ../src/shell/e-shell-window-actions.c:612
+#: ../src/shell/e-shell-window-actions.c:596
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../src/shell/e-shell-window-actions.c:613
+#: ../src/shell/e-shell-window-actions.c:597
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../src/shell/e-shell-window-actions.c:798
+#: ../src/shell/e-shell-window-actions.c:782
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:787
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ../src/shell/e-shell-window-actions.c:805
+#: ../src/shell/e-shell-window-actions.c:789
 msgid "Configure Evolution Accounts"
 msgstr "Määritä Evolution-tilit"
 
-#: ../src/shell/e-shell-window-actions.c:810
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:808
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:815
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/shell/e-shell-window-actions.c:833
+#: ../src/shell/e-shell-window-actions.c:817
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/shell/e-shell-window-actions.c:843
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/shell/e-shell-window-actions.c:845
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:852
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:864
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../src/shell/e-shell-window-actions.c:882
+#: ../src/shell/e-shell-window-actions.c:866
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../src/shell/e-shell-window-actions.c:894
-msgid "_Quick Reference"
-msgstr "_Pikaopas"
-
-#: ../src/shell/e-shell-window-actions.c:896
-msgid "Show Evolution’s shortcut keys"
-msgstr "Näytä Evolutionin pikanäppäimet"
-
-#: ../src/shell/e-shell-window-actions.c:903
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:885
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../src/shell/e-shell-window-actions.c:910
+#: ../src/shell/e-shell-window-actions.c:887
 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:894
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:922
+#: ../src/shell/e-shell-window-actions.c:899
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:901
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:908
 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:913
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../src/shell/e-shell-window-actions.c:938
+#: ../src/shell/e-shell-window-actions.c:915
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:920
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:957
+#: ../src/shell/e-shell-window-actions.c:934
 msgid "Submit _Bug Report..."
 msgstr "Lähetä _vikailmoitus..."
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:936
 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:941
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:948
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:950
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:978
 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:986
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:993
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1000
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1014
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1043
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "Show the menu bar"
 msgstr "Näytä valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1051
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../src/shell/e-shell-window-actions.c:1076
+#: ../src/shell/e-shell-window-actions.c:1053
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1059
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1061
 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:1067
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1069
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1075
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1077
 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:1099
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1101
 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:1106
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1131
+#: ../src/shell/e-shell-window-actions.c:1108
 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:1113
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1115
 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:1120
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1145
+#: ../src/shell/e-shell-window-actions.c:1122
 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:1130
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1160
+#: ../src/shell/e-shell-window-actions.c:1137
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1139
 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:1146
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1179
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1158
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1189
+#: ../src/shell/e-shell-window-actions.c:1166
 msgid "Page Set_up..."
 msgstr "_Sivun asetukset..."
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1168
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../src/shell/e-shell-window-actions.c:1560
+#: ../src/shell/e-shell-window-actions.c:1535
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../src/shell/e-shell-window-actions.c:1683
+#: ../src/shell/e-shell-window-actions.c:1658
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1700
+#: ../src/shell/e-shell-window-actions.c:1675
 #, c-format
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1804
+#: ../src/shell/e-shell-window-actions.c:1779
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
@@ -26670,12 +26869,10 @@ msgid "Failed to connect address book “{0}”"
 msgstr "Yhteys osoitekirjaan “{0}” epäonnistui"
 
 #: ../src/shell/shell.error.xml.h:20
-#| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to connect calendar “{0}”"
 msgstr "Yhteys kalenteriin “{0}” epäonnistui"
 
 #: ../src/shell/shell.error.xml.h:21
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to connect mail account “{0}”"
 msgstr "Yhteys sähköpostitiliin “{0}” epäonnistui"
 
@@ -26729,6 +26926,18 @@ msgstr ""
 msgid "SSL certificate for task list “{0}” is not trusted."
 msgstr ""
 
+#: ../src/shell/shell.error.xml.h:34
+msgid "Menu Bar is hidden"
+msgstr "Valikkopalkki on piilotettu"
+
+#: ../src/shell/shell.error.xml.h:35
+msgid "Press the “Alt” key to access the Menu Bar again."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:36
+msgid "_Show Menu Bar"
+msgstr "Näytä _valikkopalkki"
+
 #: ../src/smime/gui/ca-trust-dialog.c:104
 #, fuzzy, c-format
 #| msgid ""
@@ -27207,6 +27416,166 @@ msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
+#, fuzzy
+#~| msgid "Default reminder value"
+#~ msgid "Default reminder snooze interval, in minutes"
+#~ msgstr "Muistutuksen oletusarvo"
+
+#, fuzzy
+#~| msgctxt "iCalImp"
+#~| msgid "has reminders"
+#~ msgid "Allow past reminders"
+#~ msgstr "sisältää muistutuksia"
+
+#~ msgid "Reminder programs"
+#~ msgstr "Muistutusohjelmat"
+
+#, fuzzy
+#~ msgid "Programs that are allowed to be run by reminders"
+#~ msgstr "Ohjelmat, joita voidaan suorittaa hälytyksistä."
+
+#, fuzzy
+#~ msgid "Show display reminders in notification tray"
+#~ msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
+
+#, fuzzy
+#~ msgid "Whether or not to use the notification tray for display reminders"
+#~ msgstr "Käytetäänkö ilmoitusaluetta hälytysten näyttämiseen."
+
+#, fuzzy
+#~ msgid "Show reminder notification dialog always on top"
+#~ msgstr "Näytä näkyvät hälytykset ilmoitusalueella"
+
+#, fuzzy
+#~| msgid "Hide completed tasks"
+#~ msgid "Show reminders for completed tasks"
+#~ msgstr "Piilota valmistuneet tehtävät"
+
+#~ msgid "Evolution Alarm Notify"
+#~ msgstr "Evolutionin hälytysilmoitukset"
+
+#~ msgid "Calendar event notifications"
+#~ msgstr "Kalenteritapahtumien ilmoitukset"
+
+#~ msgid "minute"
+#~ msgid_plural "minutes"
+#~ msgstr[0] "minuutti"
+#~ msgstr[1] "minuuttia"
+
+#~ msgid "hour"
+#~ msgid_plural "hours"
+#~ msgstr[0] "tunti"
+#~ msgstr[1] "tuntia"
+
+#~ msgid "day"
+#~ msgid_plural "days"
+#~ msgstr[0] "päivä"
+#~ msgstr[1] "päivä"
+
+#~ msgid "Start time"
+#~ msgstr "Alkamisaika"
+
+#~ msgid "Appointments"
+#~ msgstr "Tapaamiset"
+
+#~ msgid "Dismiss _All"
+#~ msgstr "Hylkää _kaikki"
+
+#~ msgid "_Snooze"
+#~ msgstr "_Torku"
+
+#~ msgid "_Print"
+#~ msgstr "_Tulosta"
+
+#~ msgid "location of appointment"
+#~ msgstr "tapaamisen sijainti"
+
+#~ msgid "Snooze _time:"
+#~ msgstr "Torkkumis_aika:"
+
+#~ msgid "No summary available."
+#~ msgstr "Ei yhteenvetoa saatavilla."
+
+#~ msgid "No description available."
+#~ msgstr "Ei kuvausta saatavilla."
+
+#~ msgid "No location information available."
+#~ msgstr "Ei sijaintitietoja saatavilla."
+
+#~ msgid "Evolution Reminders"
+#~ msgstr "Evolution-muistuttajat"
+
+#~ msgid "You have %d reminder"
+#~ msgid_plural "You have %d reminders"
+#~ msgstr[0] "Sinulla on %d muistutus"
+#~ msgstr[1] "Sinulla on %d muistutusta"
+
+#~ msgid "Warning"
+#~ msgstr "Varoitus"
+
+#~ msgid "_Yes"
+#~ msgstr "_Kyllä"
+
+#~ msgid ""
+#~ "An Evolution Calendar reminder is about to trigger. This reminder is configured "
+#~ "to run the following program:\n"
+#~ "\n"
+#~ "        %s\n"
+#~ "\n"
+#~ "Are you sure you want to run this program?"
+#~ msgstr ""
+#~ "Evolution kalenterin muistutus laukeaa nyt. Muistutus on määritelty "
+#~ "suorittamaan seuraavan ohjelman:\n"
+#~ "\n"
+#~ "         %s\n"
+#~ "\n"
+#~ "Haluatko varmasti suorittaa tämän ohjelman?"
+
+#~ msgid "Do not ask me about this program again."
+#~ msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
+
+#~ msgid "invalid time"
+#~ msgstr "epäkelpo aika"
+
+#~ msgid "_Delete old messages"
+#~ msgstr "_Poista vanhat viestit"
+
+#~ msgid "AutoArchive"
+#~ msgstr "Automaattinen arkistointi"
+
+#, fuzzy
+#~| msgid ""
+#~| "This is the method Evolution will use to authenticate you.  Note that setting "
+#~| "this to \"Email Address\" requires anonymous access to your LDAP server."
+#~ msgid ""
+#~ "This is the method Evolution will use to authenticate you.  Note that setting "
+#~ "this to “Using email address” requires anonymous access to your LDAP server."
+#~ msgstr ""
+#~ "Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että "
+#~ "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
+#~ "palvelimellesi."
+
+#~ msgid "Default _snooze time (in minutes)"
+#~ msgstr "Oletus_torkkuaika (minuuteissa)"
+
+#~ msgid "This meeting recurs"
+#~ msgstr "Tapaaminen on toistuva"
+
+#~ msgid "This task recurs"
+#~ msgstr "Tehtävä on toistuva"
+
+#~ msgid "This memo recurs"
+#~ msgstr "Muistilappu on toistuva"
+
+#~ msgid "Quick _Reference"
+#~ msgstr "_Pikaopas"
+
+#~ msgid "_Quick Reference"
+#~ msgstr "_Pikaopas"
+
+#~ msgid "Show Evolution’s shortcut keys"
+#~ msgstr "Näytä Evolutionin pikanäppäimet"
+
 #~ msgid ""
 #~ "Check to make sure your password is spelled correctly and that you are using a "
 #~ "supported login method. Remember that many passwords are case sensitive; your "



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