[evolution] Update Finnish translation



commit a5d596d34abb0fa94c0f4872016e001ba17b8985
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Fri Aug 28 18:24:40 2020 +0000

    Update Finnish translation

 po/fi.po | 4552 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2420 insertions(+), 2132 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index a5954bbbea..faf71ea7a3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-08-26 13:09+0000\n"
-"PO-Revision-Date: 2019-09-07 16:41+0300\n"
+"POT-Creation-Date: 2020-07-03 07:10+0000\n"
+"PO-Revision-Date: 2020-08-28 21:23+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
 "X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -670,46 +670,56 @@ 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 "Preferred New button item"
+msgid "Let the Month View start with the current week"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "Name of the preferred New toolbar button item"
+msgid ""
+"Whether the month view should show weeks starting with the current week instead of "
+"the first week of the month."
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+msgid "Preferred New button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+msgid "Name of the preferred New toolbar button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Ensisijainen kalenteri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 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:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "Ensisijainen muistilappulista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 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:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "Ensisijainen tehtävälista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 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:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "Vapaa/varattu-mallin osoite"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, fuzzy, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the user "
@@ -718,152 +728,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:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "Toistuvat tapahtumat kursivoituna"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 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:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 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:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #, 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:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 #, fuzzy
 #| msgid "Show appointment end times in week and month views"
 msgid "Show appointment icons in the month view"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #, fuzzy
 msgid "Whether to show icons of events in the month view"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #, fuzzy
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #, fuzzy
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #, fuzzy
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 #, fuzzy
 msgid "Vertical position for the tag pane"
 msgstr "Pystysijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "Korosta tänään erääntyvät tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 #, fuzzy
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used together "
 "with task-due-today-highlight"
 msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "Tehtävien asettelutapa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "task list. “0” (Classic View) places the preview pane below the task list. "
 "“1” (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #, fuzzy
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Highlight overdue tasks"
 msgstr "Korosta eräpäivän ylittäneet tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Overdue tasks color"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 #, 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:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 #, 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:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
@@ -872,115 +882,115 @@ 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:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Twenty four hour time format"
 msgstr "24 tunnin kello"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 #, 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:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
 msgstr "Syntymä- ja vuosipäivämuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 #, fuzzy
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
 msgstr "Tapaamisen oletusmuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 #, fuzzy
 msgid "Whether to set a default reminder for appointments"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
 msgstr "Käytä järjestelmän aikavyöhykettä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 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:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "First day of the week"
 msgstr "Viikon ensimmäinen päivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Monday is a work day"
 msgstr "Maanantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Tuesday is a work day"
 msgstr "Tiistai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Wednesday is a work day"
 msgstr "Keskiviikko on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Thursday is a work day"
 msgstr "Torstai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Friday is a work day"
 msgstr "Perjantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Saturday is a work day"
 msgstr "Lauantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Sunday is a work day"
 msgstr "Sunnuntai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "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:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Draw events as flat, not shaded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 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:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 #, fuzzy
 #| msgid "Default reminder value"
 msgid "User-defined reminder times, in minutes"
 msgstr "Muistutuksen oletusarvo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 #, 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:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 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:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
 msgid "(Deprecated) Work days"
 msgstr "(Vanhennettu) Työpäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
 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-"
@@ -1672,11 +1682,15 @@ 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:115
-msgid "Search gravatar.com for photo of the sender"
+#, fuzzy
+#| msgid "Search gravatar.com for photo of the sender"
+msgid "Search libravatar.org for photo of the sender"
 msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-msgid "Allow searching also at gravatar.com for photo of the sender."
+#, fuzzy
+#| msgid "Allow searching also at gravatar.com for photo of the sender."
+msgid "Allow searching also at libravatar.org for photo of the sender."
 msgstr "Salli lähettäjän kuvan etsiminen myös gravatar.com-palvelusta."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
@@ -2567,7 +2581,7 @@ msgid "Visually wrap long lines in composer"
 msgstr "Rivitä visuaalisesti pitkät rivit lähetysikkunassa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:556
 msgid "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 
@@ -2594,46 +2608,58 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#, fuzzy
+#| msgid "Put personalized signatures at the top of replies"
+msgid "Put the signature at the top of the message"
+msgstr "Lisää oma allekirjoitus vastauksen alkuun"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+msgid ""
+"This determines whether the signature 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:284
 msgid "Apply chosen template when using Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid ""
 "Whether preserve original message subject when applying template for Alternative "
 "Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 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:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 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:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 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:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” value "
 "provides certificates only for auto-completed contacts; the “books” value uses "
@@ -2641,84 +2667,94 @@ msgid ""
 "completion."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 #, fuzzy
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of messages "
 "for offline use. The option is disabled by default."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 #, fuzzy
 #| msgid "Display reminders in _notification area only"
 msgid "Whether display delivery notification parts inline."
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification parts "
 "are shown automatically inline."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+msgid "Whether unset colors provided in HTML mails."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+msgid ""
+"If enabled, unset colors in HTML messages, forcing use of desktop theme colors "
+"instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “forward-"
 "style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “reply-"
 "style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 #, 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:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “show-"
 "headers” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 #, 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:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 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:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 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:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
@@ -3190,6 +3226,17 @@ msgid ""
 "is escaped and appended to this string. The URI should start with https://.";
 msgstr ""
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:40
+msgid "Minimum font size to be used by WebKitGTK"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:41
+msgid ""
+"The minimum font size in pixels used to display text in WebKitGTK. This setting "
+"controls the absolute smallest size. Values other than 0 can potentially break "
+"page layouts. Negative values are treated as 0."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
@@ -3234,9 +3281,9 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
-#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1252
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1291
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
+#: ../src/shell/e-shell-window-private.c:241
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -3294,13 +3341,13 @@ 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:314
-#: ../src/modules/addressbook/e-book-shell-view.c:412
+#: ../src/modules/addressbook/e-book-shell-view.c:421
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:954
-#: ../src/e-util/e-collection-account-wizard.c:816 ../src/e-util/e-send-options.c:544
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
+#: ../src/e-util/e-collection-account-wizard.c:839 ../src/e-util/e-send-options.c:544
 #: ../src/e-util/e-webdav-browser.c:470
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 #: ../src/modules/calendar/e-cal-shell-view.c:599
@@ -3312,14 +3359,14 @@ msgstr "Kalenteri"
 #: ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1493
+#: ../src/modules/mail/e-mail-shell-view.c:1624
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Sähköposti"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
 #: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-cal-shell-content.c:1763
+#: ../src/modules/calendar/e-cal-shell-content.c:1773
 #: ../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
@@ -3327,15 +3374,15 @@ msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2426
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1141
 #: ../src/e-util/e-webdav-browser.c:461
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
-#: ../src/modules/calendar/e-cal-shell-content.c:1723
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-cal-shell-content.c:1733
 #: ../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:508
+#: ../src/modules/calendar/e-task-shell-view.c:515
 msgid "Tasks"
 msgstr "Tehtävät"
 
@@ -3639,11 +3686,11 @@ msgstr "Le_veälle näkymälle"
 msgid "As Sent Folder for Wi_de View"
 msgstr "Lähetetyt-kansion mukaan _leveässä näkymässä"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2429
 msgid "_Memos"
 msgstr "_Muistilaput"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2433
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Tehtävät"
@@ -3796,7 +3843,7 @@ msgstr ""
 
 #: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:751
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1525
 #: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
@@ -3845,7 +3892,7 @@ msgstr ""
 "silti?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -3978,7 +4025,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:2353
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2379
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Asetukset"
@@ -3994,37 +4041,37 @@ msgstr "Asetukset"
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:510
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:746
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
-#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-cal-dialogs.c:690
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
-#: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
+#: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
 #: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668 ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
 #: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
 #: ../src/e-util/e-collection-account-wizard.c:238
-#: ../src/e-util/e-collection-account-wizard.c:1838
-#: ../src/e-util/e-collection-account-wizard.c:2074
+#: ../src/e-util/e-collection-account-wizard.c:1868
+#: ../src/e-util/e-collection-account-wizard.c:2109
 #: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:300
-#: ../src/e-util/e-html-editor-actions.c:304
-#: ../src/e-util/e-html-editor-actions.c:348
-#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
 #: ../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-source-selector-dialog.c:325 ../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:4347
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3932
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4047
-#: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4050
+#: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
@@ -4050,12 +4097,12 @@ msgstr "_Peru"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:749
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
 #: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2158
-#: ../src/composer/e-composer-actions.c:228 ../src/composer/e-composer-actions.c:340
+#: ../src/composer/e-composer-actions.c:242 ../src/composer/e-composer-actions.c:354
 #: ../src/e-util/e-attachment-store.c:848 ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:4347
+#: ../src/e-util/e-webdav-browser.c:2457 ../src/e-util/e-web-view.c:3932
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
 #: ../src/smime/gui/certificate-manager.c:651
@@ -4067,12 +4114,12 @@ msgstr "_Tallenna"
 #: ../src/calendar/gui/e-comp-editor.c:2055 ../src/calendar/gui/e-comp-editor.c:2127
 #: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:1019
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3573
+#: ../src/e-util/e-misc-utils.c:3574
 msgid "Image"
 msgstr "Kuva"
 
@@ -4098,8 +4145,8 @@ msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1291
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "Sähköposti"
@@ -4130,8 +4177,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:870
-#: ../src/modules/itip-formatter/itip-view.c:2071
+#: ../src/calendar/gui/e-comp-editor-event.c:877
+#: ../src/modules/itip-formatter/itip-view.c:1972
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -4219,14 +4266,14 @@ msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
 #: ../src/calendar/gui/e-calendar-view.c:2098
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
 #: ../src/calendar/gui/e-calendar-view.c:2097
 msgid "Birthday"
@@ -4234,7 +4281,7 @@ msgstr "Syntymäpäivä"
 
 #. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../src/mail/e-mail-config-defaults-page.c:887
+#: ../src/mail/e-mail-config-defaults-page.c:888
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -4277,7 +4324,7 @@ msgstr "Koti"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:969
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Työ"
@@ -4285,7 +4332,7 @@ msgstr "Työ"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1035
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
 #: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Other"
 msgstr "Muut"
@@ -4340,22 +4387,26 @@ msgid "Certificates"
 msgstr "Varmenteet"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2090 ../src/e-util/e-html-editor-actions.c:945
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/e-util/e-html-editor-actions.c:1107
 msgid "_Undo"
 msgstr "_Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "Kumoa"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2097 ../src/e-util/e-html-editor-actions.c:931
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:1093
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "Tee uudelleen"
 
@@ -4387,6 +4438,8 @@ msgid "PGP keys"
 msgstr "PGP-avaimet"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/e-util/e-html-editor-actions.c:395
+#: ../src/e-util/e-image-chooser-dialog.c:193
 #: ../src/smime/gui/certificate-manager.c:672
 #: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
@@ -4404,9 +4457,9 @@ msgstr "Avaa X.509-varmenne"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
 #: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
-#: ../src/e-util/e-html-editor-actions.c:304
-#: ../src/e-util/e-html-editor-actions.c:348
-#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
 #: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
 msgid "_Open"
@@ -4454,7 +4507,7 @@ msgstr "Valitse kuva tälle henkilölle"
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4462,28 +4515,28 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4722
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
 #, 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:4730
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
 #, 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:4743
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4757
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” on tyhjä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4772
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -4495,16 +4548,15 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
 #: ../src/e-util/e-category-editor.c:258 ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:243 ../src/e-util/e-passwords.c:469
+#: ../src/e-util/e-html-editor-link-dialog.c:240 ../src/e-util/e-passwords.c:469
 #: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:188
 #: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:934
 #: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:361
-#: ../src/e-util/e-source-selector-dialog.c:371 ../src/e-util/e-table-config.c:549
+#: ../src/e-util/e-source-selector-dialog.c:326 ../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:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
-#: ../src/mail/mail-dialogs.ui.h:23 ../src/mail/mail-vfolder-ui.c:150
-#: ../src/mail/mail-vfolder-ui.c:272
+#: ../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
@@ -4605,7 +4657,7 @@ msgid "_Suffix:"
 msgstr "_Pääte:"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
@@ -4647,12 +4699,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:3475 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3492 ../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:3476 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3493 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "_Alas"
 
@@ -4661,23 +4713,23 @@ msgstr "_Alas"
 msgid "_Bottom"
 msgstr "Ali_mmaiseksi"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
@@ -4697,7 +4749,7 @@ msgstr "Sähköposti alkaa"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:807
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -4712,22 +4764,22 @@ msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:428
+#: ../src/e-util/e-web-view.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:440
+#: ../src/e-util/e-web-view.c:441
 msgid "_Send New Message To…"
 msgstr "Lähetä uusi _viesti…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:442
+#: ../src/e-util/e-web-view.c:443
 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:1446
+#: ../src/e-util/e-misc-utils.c:4546
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -4750,161 +4802,159 @@ msgstr "SIP"
 msgid "List Members:"
 msgstr "Luettelon jäsenet:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:956
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+msgid "Fax"
+msgstr "Fax"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:883
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:884
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Asema"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Johtaja"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:952
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Apulainen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:955
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:957
-msgid "Fax"
-msgstr "Fax"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:959
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1025
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1012
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1057
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1253
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1276
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1317
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1327
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
 msgid "Blog"
 msgstr "Blogi"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:299
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:305
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1143
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:489
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:495
 msgid "Merge Contact"
 msgstr "Yhdistä yhteystieto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:511
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:517
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:758
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:741
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:747
 msgid "Duplicate Contact Detected"
 msgstr "Päällekkäisiä yhteystietoja havaittu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:799
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:805
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -4912,7 +4962,7 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko tallentaa muutokset joka tapauksessa?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:802
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:808
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -4920,19 +4970,19 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:817
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:823
 msgid "Changed Contact:"
 msgstr "Muutettu yhteystieto:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:819
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:825
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:858
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:864
 msgid "Conflicting Contact:"
 msgstr "Ristiriitainen yhteystieto:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:860
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:866
 msgid "Old Contact:"
 msgstr "Vanha yhteystieto:"
 
@@ -5070,69 +5120,69 @@ msgstr "Haku keskeytettiin"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1294
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1298
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1308
 msgid "Are you sure you want to delete this contact?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1312
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1323
 #: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-accounts-window.c:1753
-#: ../src/e-util/e-focus-tracker.c:783 ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2697 ../src/mail/e-mail-account-manager.c:739
+#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:806
+#: ../src/e-util/e-webdav-browser.c:2678 ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1628
-#: ../src/shell/e-shell-window-actions.c:877
+#: ../src/shell/e-shell-window-actions.c:917
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Poista"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1471
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -5147,11 +5197,11 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää nämä kaikki yhteystiedot?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "_Don’t Display"
 msgstr "Ä_lä näytä"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -5266,7 +5316,7 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:664
+#: ../src/calendar/gui/e-meeting-list-view.c:663
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
@@ -5329,15 +5379,15 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2862
+#: ../src/mail/e-mail-reader.c:2861
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:2015
+#: ../src/e-util/e-html-editor-actions.c:2206
 #: ../src/e-util/e-html-editor-find-dialog.c:244
-#: ../src/shell/e-shell-window-actions.c:947
+#: ../src/shell/e-shell-window-actions.c:994
 msgid "_Find"
 msgstr "_Etsi"
 
@@ -5588,12 +5638,18 @@ msgid "Phone"
 msgstr "Puhelin"
 
 #: ../src/calendar/calendar.error.xml.h:1
-msgid "Would you like to send all the participants a cancelation notice?"
+#, fuzzy
+#| msgid "Would you like to send all the participants a cancelation notice?"
+msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Haluatko lähettää perumisilmoituksen kaikille osanottajille?"
 
 #: ../src/calendar/calendar.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not know "
+#| "the meeting is canceled."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know the "
+"If you do not send a cancellation notice, the other participants may not know the "
 "meeting is canceled."
 msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että kokous on "
@@ -5617,8 +5673,12 @@ msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä kokouksesta poistetaan eikä niitä voi palauttaa."
 
 #: ../src/calendar/calendar.error.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not know "
+#| "the task has been deleted."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know the "
+"If you do not send a cancellation notice, the other participants may not know the "
 "task has been deleted."
 msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että tehtävä on "
@@ -5634,12 +5694,18 @@ msgid "All information on this task will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä tehtävästä poistetaan eikä niitä voi palauttaa."
 
 #: ../src/calendar/calendar.error.xml.h:11
-msgid "Would you like to send a cancelation notice for this memo?"
+#, fuzzy
+#| msgid "Would you like to send a cancelation notice for this memo?"
+msgid "Would you like to send a cancellation notice for this memo?"
 msgstr "Haluatko lähettää perumisilmoituksen tälle muistilapulle?"
 
 #: ../src/calendar/calendar.error.xml.h:12
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not know "
+#| "the memo has been deleted."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know the "
+"If you do not send a cancellation notice, the other participants may not know the "
 "memo has been deleted."
 msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
@@ -6357,7 +6423,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:1930
+#: ../src/e-util/e-collection-account-wizard.c:1960
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6399,7 +6465,7 @@ msgstr "Henkilökohtainen"
 #: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:265
 #: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
-#: ../src/e-util/e-html-editor-page-dialog.c:113 ../src/e-util/e-send-options.ui.h:7
+#: ../src/e-util/e-html-editor-page-dialog.c:116 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
@@ -6409,6 +6475,7 @@ msgid "Organizer"
 msgstr "Järjestäjä"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-list-view.c:623
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6431,7 +6498,7 @@ msgstr "Luokka"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:16 ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
-#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print.c:50
 #: ../src/em-format/e-mail-formatter-print-headers.c:161
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
@@ -6451,7 +6518,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:2065
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2101
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -6481,65 +6548,65 @@ msgstr "Yhteenveto sisältää"
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../src/calendar/gui/comp-util.c:1544
-#: ../src/modules/itip-formatter/itip-view.c:2391
+#: ../src/calendar/gui/comp-util.c:1546
+#: ../src/modules/itip-formatter/itip-view.c:2294
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/comp-util.c:1603
+#: ../src/calendar/gui/comp-util.c:1605
 #, c-format
 msgid "Comments: %s"
 msgstr "Kommentit: %s"
 
-#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+#: ../src/calendar/gui/comp-util.c:1619 ../src/calendar/gui/comp-util.c:1622
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/calendar/gui/comp-util.c:1618
+#: ../src/calendar/gui/comp-util.c:1620
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/comp-util.c:1619
+#: ../src/calendar/gui/comp-util.c:1621
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "Vahvistettu"
 
-#: ../src/calendar/gui/comp-util.c:1621
+#: ../src/calendar/gui/comp-util.c:1623
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../src/calendar/gui/comp-util.c:1622
+#: ../src/calendar/gui/comp-util.c:1624
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr ""
 
-#: ../src/calendar/gui/comp-util.c:1623
+#: ../src/calendar/gui/comp-util.c:1625
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../src/calendar/gui/comp-util.c:1624
+#: ../src/calendar/gui/comp-util.c:1626
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../src/calendar/gui/comp-util.c:1625
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/comp-util.c:1626
+#: ../src/calendar/gui/comp-util.c:1628
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../src/calendar/gui/comp-util.c:1627
+#: ../src/calendar/gui/comp-util.c:1629
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "Peruttu"
@@ -6647,28 +6714,28 @@ msgstr "Napsauta tästä, voit löytää lisää tapahtumia."
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:387
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2214
 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:391
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2212
 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:395
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2218
 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:399
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2216
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Suorita ohjelma"
@@ -6765,7 +6832,7 @@ msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:237
-#: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:1068 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -6775,8 +6842,8 @@ msgstr "Luokat:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1677
-#: ../src/modules/itip-formatter/itip-view.c:1788
+#: ../src/modules/itip-formatter/itip-view.c:1700
+#: ../src/modules/itip-formatter/itip-view.c:1811
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -6799,27 +6866,27 @@ msgid "Recurs:"
 msgstr "Toistuva"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1680
-#: ../src/modules/itip-formatter/itip-view.c:1797
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1820
 msgid "Status:"
 msgstr "Tila:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:347
 #: ../src/calendar/gui/e-task-table.c:471 ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:331
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
 msgid "High"
 msgstr "Korkea"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:349
 #: ../src/calendar/gui/e-cal-model.c:1872 ../src/calendar/gui/e-task-table.c:472
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:333
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:351
 #: ../src/calendar/gui/e-task-table.c:473 ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:329
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
 msgid "Low"
 msgstr "Matala"
 
@@ -6864,7 +6931,7 @@ msgstr "Avataan tehtävälistaa '%s'"
 msgid "Creating view for memo list “%s”"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1964
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1991
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
@@ -6885,104 +6952,104 @@ msgstr "Poistetaanko muistilappulista \"{0}\"?"
 msgid "Copying tasks to the task list “%s”"
 msgstr "Kopioidaan tehtäviä tehtävälistaan '%s'"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:527
+#: ../src/calendar/gui/e-cal-dialogs.c:528
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr "_Poistetaanko tämä tietue kaikkien muiden vastaanottajien kansioista?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:531
 msgid "_Retract comment"
 msgstr "_Poista kommentti"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:687
+#: ../src/calendar/gui/e-cal-dialogs.c:688
 msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:688
+#: ../src/calendar/gui/e-cal-dialogs.c:689
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:707
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "January"
 msgstr "Tammikuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:708
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "February"
 msgstr "Helmikuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:709
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "March"
 msgstr "Maaliskuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:710
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "April"
 msgstr "Huhtikuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:711
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "May"
 msgstr "Toukokuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "June"
 msgstr "Kesäkuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "July"
 msgstr "Heinäkuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "August"
 msgstr "Elokuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "September"
 msgstr "Syyskuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "October"
 msgstr "Lokakuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "November"
 msgstr "Marraskuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:719
 msgid "December"
 msgstr "Joulukuu"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:870
+#: ../src/calendar/gui/e-cal-dialogs.c:871
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:872
+#: ../src/calendar/gui/e-cal-dialogs.c:873
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:876
+#: ../src/calendar/gui/e-cal-dialogs.c:877
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:880
+#: ../src/calendar/gui/e-cal-dialogs.c:881
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:906
+#: ../src/calendar/gui/e-cal-dialogs.c:908
 msgid "This Instance Only"
 msgstr "Vain tätä kertaa"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:910
+#: ../src/calendar/gui/e-cal-dialogs.c:912
 msgid "This and Prior Instances"
 msgstr "Tätä ja edellisiä kertoja"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:916
+#: ../src/calendar/gui/e-cal-dialogs.c:918
 msgid "This and Future Instances"
 msgstr "Tätä ja tulevia kertoja"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:921
+#: ../src/calendar/gui/e-cal-dialogs.c:923
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
@@ -7015,17 +7082,17 @@ msgstr "Poista valitut tapahtumat"
 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:917 ../src/calendar/gui/e-cal-ops.c:1555
+#: ../src/calendar/gui/e-calendar-view.c:917 ../src/calendar/gui/e-cal-ops.c:1582
 msgid "Default calendar not found"
 msgstr "Oletuskalenteria ei löytynyt"
 
-#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1558
+#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1585
 #, fuzzy
 #| msgid "Mark as default memo list"
 msgid "Default memo list not found"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../src/calendar/gui/e-calendar-view.c:927 ../src/calendar/gui/e-cal-ops.c:1561
+#: ../src/calendar/gui/e-calendar-view.c:927 ../src/calendar/gui/e-cal-ops.c:1588
 msgid "Default task list not found"
 msgstr "Oletustehtävälistaa ei löytynyt"
 
@@ -7048,7 +7115,7 @@ msgstr "Liitetään iCalendar-tietoja"
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
 
-#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
 #: ../src/calendar/gui/e-calendar-view.c:1892 ../src/calendar/gui/e-memo-table.c:577
@@ -7062,7 +7129,7 @@ msgstr "Järjestäjä: %s"
 #: ../src/calendar/gui/e-calendar-view.c:1911
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
 #: ../src/calendar/gui/e-task-table.c:758 ../src/calendar/gui/e-to-do-pane.c:377
-#: ../src/calendar/gui/print.c:3565
+#: ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
@@ -7080,8 +7147,6 @@ msgstr "Aika: %s %s"
 #. anniversary is for. Example: "Birthday: John Doe (13)"
 #: ../src/calendar/gui/e-calendar-view.c:2117
 #, c-format
-#| msgctxt "language"
-#| msgid "%s (%s)"
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -7159,7 +7224,7 @@ msgstr "Lähde"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:10
 #: ../src/calendar/gui/e-cal-model.c:3846
-#: ../src/calendar/gui/e-meeting-list-view.c:693
+#: ../src/calendar/gui/e-meeting-list-view.c:692
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7170,13 +7235,13 @@ msgid "Status"
 msgstr "Tila"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:650
+#: ../src/calendar/gui/e-meeting-list-view.c:649
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1971
-#: ../src/e-util/e-webdav-browser.c:2390 ../src/mail/e-mail-account-tree-view.c:158
+#: ../src/e-util/e-collection-account-wizard.c:2001
+#: ../src/e-util/e-webdav-browser.c:2371 ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -7185,33 +7250,33 @@ msgstr "Tyyppi"
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1257
-#: ../src/calendar/gui/print.c:1274 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3640
-#: ../src/modules/itip-formatter/itip-view.c:6686
+#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
+#: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3460
+#: ../src/modules/itip-formatter/itip-view.c:6505
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:609
-#: ../src/calendar/gui/e-cal-ops.c:1246
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:378
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:626
+#: ../src/calendar/gui/e-cal-ops.c:1267
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:185
-#: ../src/calendar/gui/e-cal-ops.c:1363
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
+#: ../src/calendar/gui/e-cal-ops.c:1384
 msgid "Creating an event"
 msgstr "Luodaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:189
-#: ../src/calendar/gui/e-cal-ops.c:1367
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
+#: ../src/calendar/gui/e-cal-ops.c:1388
 msgid "Creating a memo"
 msgstr "Luodaan muistilappu"
 
-#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:193
-#: ../src/calendar/gui/e-cal-ops.c:1371
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
+#: ../src/calendar/gui/e-cal-ops.c:1392
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
@@ -7224,12 +7289,12 @@ msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
 #: ../src/calendar/gui/e-cal-model.c:1879
-#: ../src/calendar/gui/e-cal-model-tasks.c:1096
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "Kyllä"
 
 #: ../src/calendar/gui/e-cal-model.c:1879
-#: ../src/calendar/gui/e-cal-model-tasks.c:1096
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "Ei"
 
@@ -7237,7 +7302,7 @@ msgstr "Ei"
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6674
+#: ../src/modules/itip-formatter/itip-view.c:6493
 msgid "Accepted"
 msgstr "Hyväksytty"
 
@@ -7245,7 +7310,7 @@ msgstr "Hyväksytty"
 #: ../src/calendar/gui/e-meeting-list-view.c:209
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6680
+#: ../src/modules/itip-formatter/itip-view.c:6499
 msgid "Declined"
 msgstr "Hylätty"
 
@@ -7261,7 +7326,7 @@ msgstr "Alustava"
 #: ../src/calendar/gui/e-meeting-list-view.c:211
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6683
+#: ../src/modules/itip-formatter/itip-view.c:6502
 msgid "Delegated"
 msgstr "Valtuutettu"
 
@@ -7280,7 +7345,7 @@ msgstr "Vapaa"
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:456
+#: ../src/calendar/gui/e-cal-model-tasks.c:458
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7290,39 +7355,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:553
+#: ../src/calendar/gui/e-cal-model-tasks.c:555
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:305
+#: ../src/calendar/gui/e-cal-ops.c:314
 msgid "Modifying an event"
 msgstr "Muokataan tapahtumaa"
 
-#: ../src/calendar/gui/e-cal-ops.c:309
+#: ../src/calendar/gui/e-cal-ops.c:318
 #, fuzzy
 #| msgid "Missing name."
 msgid "Modifying a memo"
 msgstr "Nimi puuttuu."
 
-#: ../src/calendar/gui/e-cal-ops.c:313
+#: ../src/calendar/gui/e-cal-ops.c:322
 msgid "Modifying a task"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:411 ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:423 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:415 ../src/calendar/gui/e-to-do-pane.c:2078
+#: ../src/calendar/gui/e-cal-ops.c:427 ../src/calendar/gui/e-to-do-pane.c:2078
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../src/calendar/gui/e-cal-ops.c:419 ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-cal-ops.c:431 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-ops.c:507
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, fuzzy, c-format
 #| msgid "Meeting information sent"
 msgid "Deleting an event"
@@ -7330,7 +7395,7 @@ msgid_plural "Deleting %d events"
 msgstr[0] "Kokouksen tiedot lähetetty"
 msgstr[1] "Kokouksen tiedot lähetetty"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
+#: ../src/calendar/gui/e-cal-ops.c:523
 #, fuzzy, c-format
 #| msgid "Delete Memo"
 msgid "Deleting a memo"
@@ -7338,14 +7403,14 @@ msgid_plural "Deleting %d memos"
 msgstr[0] "Poista muistilappu"
 msgstr[1] "Poista muistilappu"
 
-#: ../src/calendar/gui/e-cal-ops.c:515
+#: ../src/calendar/gui/e-cal-ops.c:527
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Poistetaan tehtävä"
 msgstr[1] "Poistetaan %d tehtävää"
 
-#: ../src/calendar/gui/e-cal-ops.c:721
+#: ../src/calendar/gui/e-cal-ops.c:738
 #, fuzzy, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
@@ -7353,7 +7418,7 @@ msgid_plural "Pasting %d events"
 msgstr[0] "Tulosta tämä tapahtuma"
 msgstr[1] "Tulosta tämä tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:736
+#: ../src/calendar/gui/e-cal-ops.c:753
 #, fuzzy, c-format
 #| msgid "Print this memo"
 msgid "Pasting a memo"
@@ -7361,7 +7426,7 @@ msgid_plural "Pasting %d memos"
 msgstr[0] "Tulosta tämä muistilappu"
 msgstr[1] "Tulosta tämä muistilappu"
 
-#: ../src/calendar/gui/e-cal-ops.c:751
+#: ../src/calendar/gui/e-cal-ops.c:768
 #, fuzzy, c-format
 #| msgid "Print this task"
 msgid "Pasting a task"
@@ -7369,97 +7434,97 @@ msgid_plural "Pasting %d tasks"
 msgstr[0] "Tulosta tämä tehtävä"
 msgstr[1] "Tulosta tämä tehtävä"
 
-#: ../src/calendar/gui/e-cal-ops.c:847
+#: ../src/calendar/gui/e-cal-ops.c:868
 msgid "Updating an event"
 msgstr "Päivitetään tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:851
+#: ../src/calendar/gui/e-cal-ops.c:872
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a memo"
 msgstr "Päivitetään olioita"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
+#: ../src/calendar/gui/e-cal-ops.c:876
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "Päivitetään olioita"
 
-#: ../src/calendar/gui/e-cal-ops.c:968
+#: ../src/calendar/gui/e-cal-ops.c:989
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/calendar/gui/e-cal-ops.c:972
+#: ../src/calendar/gui/e-cal-ops.c:993
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-ops.c:976
+#: ../src/calendar/gui/e-cal-ops.c:997
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:1002
+#: ../src/calendar/gui/e-cal-ops.c:1023
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Purging events in the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/calendar/gui/e-cal-ops.c:1006
+#: ../src/calendar/gui/e-cal-ops.c:1027
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Purging memos in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/calendar/gui/e-cal-ops.c:1010
+#: ../src/calendar/gui/e-cal-ops.c:1031
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Purging tasks in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/calendar/gui/e-cal-ops.c:1105
+#: ../src/calendar/gui/e-cal-ops.c:1126
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "Tyhjennetään"
 
-#: ../src/calendar/gui/e-cal-ops.c:1109
+#: ../src/calendar/gui/e-cal-ops.c:1130
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "Tulosta muistilaput"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1134
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../src/calendar/gui/e-cal-ops.c:1215
+#: ../src/calendar/gui/e-cal-ops.c:1236
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "Piilota valmistuneet tehtävät"
 
-#: ../src/calendar/gui/e-cal-ops.c:2057
+#: ../src/calendar/gui/e-cal-ops.c:2084
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/e-cal-ops.c:2058
+#: ../src/calendar/gui/e-cal-ops.c:2085
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Kopioidaan tapahtuma"
 msgstr[1] "Kopioidaan %d tapahtumaa"
 
-#: ../src/calendar/gui/e-cal-ops.c:2064
+#: ../src/calendar/gui/e-cal-ops.c:2091
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a memo"
@@ -7467,7 +7532,7 @@ msgid_plural "Moving %d memos"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../src/calendar/gui/e-cal-ops.c:2065
+#: ../src/calendar/gui/e-cal-ops.c:2092
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a memo"
@@ -7475,7 +7540,7 @@ msgid_plural "Copying %d memos"
 msgstr[0] "Kopioidaan tiedostoja"
 msgstr[1] "Kopioidaan tiedostoja"
 
-#: ../src/calendar/gui/e-cal-ops.c:2071
+#: ../src/calendar/gui/e-cal-ops.c:2098
 #, fuzzy, c-format
 #| msgid "Moving Items"
 msgid "Moving a task"
@@ -7483,7 +7548,7 @@ msgid_plural "Moving %d tasks"
 msgstr[0] "Siirretään kohteita"
 msgstr[1] "Siirretään kohteita"
 
-#: ../src/calendar/gui/e-cal-ops.c:2072
+#: ../src/calendar/gui/e-cal-ops.c:2099
 #, fuzzy, c-format
 #| msgid "Copying Items"
 msgid "Copying a task"
@@ -7514,37 +7579,37 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "Tapahtuman ajankohta on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:208
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 msgid "Event cannot be edited, because the selected calendar could not be opened"
 msgstr "Tapahtumaa ei voi muokata, koska valittua kalenteria ei voida avata"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 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:212
+#: ../src/calendar/gui/e-comp-editor-event.c:214
 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:492
+#: ../src/calendar/gui/e-comp-editor-event.c:506
 #: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "Start date is not a valid date"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:494
+#: ../src/calendar/gui/e-comp-editor-event.c:508
 msgid "Start time is not a valid time"
 msgstr "Alkamisaika on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:498
-#: ../src/calendar/gui/e-comp-editor-event.c:514
+#: ../src/calendar/gui/e-comp-editor-event.c:512
+#: ../src/calendar/gui/e-comp-editor-event.c:528
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338
-#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4257
-#: ../src/e-util/e-misc-utils.c:4269 ../src/e-util/e-misc-utils.c:4283
-#: ../src/mail/e-mail-autoconfig.c:1029 ../src/mail/e-mail-display.c:2295
-#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3841
-#: ../src/mail/em-composer-utils.c:3872 ../src/mail/mail-send-recv.c:598
-#: ../src/mail/mail-send-recv.c:1496
+#: ../src/calendar/gui/e-comp-editor.c:338 ../src/composer/e-composer-actions.c:180
+#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:3992
+#: ../src/e-util/e-misc-utils.c:4004 ../src/e-util/e-misc-utils.c:4018
+#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2444
+#: ../src/mail/e-mail-notes.c:875 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/mail/em-composer-utils.c:3843 ../src/mail/em-composer-utils.c:3874
+#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
 #: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
@@ -7552,166 +7617,173 @@ msgstr "Alkamisaika on virheellinen"
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:508
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 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:510
+#: ../src/calendar/gui/e-comp-editor-event.c:524
 msgid "End time is not a valid time"
 msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:712
-#: ../src/calendar/gui/e-comp-editor-memo.c:134
+#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-memo.c:256
 #: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:714
-#: ../src/calendar/gui/e-comp-editor-memo.c:136
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-memo.c:258
 #: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:720
+#: ../src/calendar/gui/e-comp-editor-event.c:727
 #: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:722
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 #: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
+#: ../src/calendar/gui/e-comp-editor-event.c:735
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:730
+#: ../src/calendar/gui/e-comp-editor-event.c:737
 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:736
+#: ../src/calendar/gui/e-comp-editor-event.c:743
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:738
+#: ../src/calendar/gui/e-comp-editor-event.c:745
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:747
+#: ../src/calendar/gui/e-comp-editor-event.c:754
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:749
+#: ../src/calendar/gui/e-comp-editor-event.c:756
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:754
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:756
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:761
+#: ../src/calendar/gui/e-comp-editor-event.c:768
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:763
+#: ../src/calendar/gui/e-comp-editor-event.c:770
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:881
+#: ../src/calendar/gui/e-comp-editor-event.c:888
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:886
+#: ../src/calendar/gui/e-comp-editor-event.c:893
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:896
+#: ../src/calendar/gui/e-comp-editor-event.c:903
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:964
-#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-memo.c:357
 #: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:967
+#: ../src/calendar/gui/e-comp-editor-event.c:974
 #: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:970
+#: ../src/calendar/gui/e-comp-editor-event.c:977
 #: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:973
-#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-event.c:980
+#: ../src/calendar/gui/e-comp-editor-memo.c:360
 #: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:983
+#: ../src/calendar/gui/e-comp-editor-event.c:990
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1018
+#: ../src/calendar/gui/e-comp-editor-event.c:1025
 #, c-format
 msgid "Meeting — %s"
 msgstr "Kokous — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1019
+#: ../src/calendar/gui/e-comp-editor-event.c:1026
 #, c-format
 msgid "Appointment — %s"
 msgstr "Tapaaminen — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:96
+#: ../src/calendar/gui/e-comp-editor-memo.c:59
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#, fuzzy
+#| msgid "New Window"
+msgid "New note"
+msgstr "Uusi ikkuna"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:218
 #, 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:98
+#: ../src/calendar/gui/e-comp-editor-memo.c:220
 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:100
+#: ../src/calendar/gui/e-comp-editor-memo.c:222
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:196
+#: ../src/calendar/gui/e-comp-editor-memo.c:318
 #: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "_Luettelo:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:203
+#: ../src/calendar/gui/e-comp-editor-memo.c:325
 #: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:266
+#: ../src/calendar/gui/e-comp-editor-memo.c:392
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Memo — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:267
+#: ../src/calendar/gui/e-comp-editor-memo.c:393
 #, fuzzy, c-format
 #| msgid "Memo - %s"
 msgid "Memo — %s"
@@ -7763,12 +7835,12 @@ msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, pl
 msgstr ""
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
-#: ../src/composer/e-composer-actions.c:312
+#: ../src/composer/e-composer-actions.c:326
 msgid "_Attachment…"
 msgstr "_Liite…"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
-#: ../src/composer/e-composer-actions.c:314 ../src/e-util/e-attachment-view.c:343
+#: ../src/composer/e-composer-actions.c:328 ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
@@ -7780,12 +7852,12 @@ msgstr "_Liitteet"
 msgid "Show attachments"
 msgstr "Näytä liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:812
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:814
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Luettelonäkymä"
@@ -7885,25 +7957,23 @@ msgid "Override color of the task. If not set, then color of the task list is us
 msgstr ""
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1450
-#, fuzzy
-#| msgid "Atte_ndees"
 msgctxt "ECompEditor"
 msgid "Atte_ndees…"
-msgstr "_Osanottajat"
+msgstr "_Osanottajat…"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1533
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2321
 #: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:954
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2690
+#: ../src/e-util/e-html-editor-actions.c:1116
+#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2671
 #: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:730
-#: ../src/mail/e-mail-browser.c:195 ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:380
 #: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
 #: ../src/plugins/email-custom-header/email-custom-header.c:844
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1005 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1052 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -8076,7 +8146,7 @@ msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1091
 #, fuzzy
 #| msgid "occurrences"
 msgctxt "ECompEditorPageRecur"
@@ -8084,20 +8154,20 @@ msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2113
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Tämä tapaaminen _toistuu"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1561
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Tämä tehtävä _toistuu"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1566
 #, fuzzy
 #| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
@@ -8105,104 +8175,104 @@ msgid "This memo rec_urs"
 msgstr "Muistilappu on toistuva"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1571
 #, fuzzy
 #| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1942
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Recurrence exception date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1998
 #, fuzzy
 #| msgid "End time of the recurrence was before event's start"
 msgid "End time of the recurrence is before the start"
 msgstr "Toistuvuuden päättymispäivä oli ennen tapahtuman alkua"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2041
 msgid "R_ecurrence"
 msgstr "Toistu_vuus"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2043
 #, fuzzy
 #| msgid "It has recurrences."
 msgid "Set or unset recurrence"
 msgstr "Sisältää toistuvuuksia."
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
 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:2144
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2180
 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:2146
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2182
 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:2148
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2184
 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:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2186
 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:2179
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2215
 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:2181
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2217
 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:2183
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2219
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ikuisesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2235
 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:2212
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2248
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2313
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2168
 #: ../src/mail/e-mail-config-identity-page.c:854 ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "_Lisää"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2329
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2176
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Poista"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2337
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -8212,18 +8282,18 @@ msgstr "Esikatselu"
 msgid "Send To"
 msgstr "Lähetä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1592
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1594
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1706
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
@@ -8231,14 +8301,13 @@ msgstr "Ei mitään"
 #. Translators: This constructs predefined reminder's description, for example "15 minutes before",
 #. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
 #. "2 days 13 hours 1 minute before".
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1716
 #, c-format
-#| msgid "is before"
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s ennen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1721
 #, fuzzy
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
@@ -8246,62 +8315,58 @@ msgid "at the start"
 msgstr "Liite: %s"
 
 #. 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:1729
 #, fuzzy
 #| msgid "Custom"
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Omavalintainen"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1875
 msgid "Set a custom predefined time to"
 msgstr ""
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1888
 msgctxt "cal-reminders"
 msgid "da_ys"
 msgstr ""
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
-#| msgctxt "cal-reminders"
-#| msgid "hours"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1904
 msgctxt "cal-reminders"
 msgid "_hours"
 msgstr "_tuntia"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
-#| msgctxt "cal-reminders"
-#| msgid "minutes"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1920
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "_minuuttia"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
 msgid "_Add time"
 msgstr "_Lisää aika"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2006
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2031
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2056
 msgid "Add custom predefined time"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
 msgid "Remove custom predefined times"
 msgstr ""
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2249
 #, fuzzy
 #| msgid "minute(s)"
 msgctxt "cal-reminders"
@@ -8309,7 +8374,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:2225
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2251
 #, fuzzy
 #| msgid "hour(s)"
 msgctxt "cal-reminders"
@@ -8317,7 +8382,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:2227
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2253
 #, fuzzy
 #| msgid "day(s)"
 msgctxt "cal-reminders"
@@ -8325,7 +8390,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:2244
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2270
 #, fuzzy
 #| msgid "before"
 msgctxt "cal-reminders"
@@ -8333,7 +8398,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:2246
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2272
 #, fuzzy
 #| msgid "after"
 msgctxt "cal-reminders"
@@ -8341,7 +8406,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:2262
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2288
 #, fuzzy
 #| msgid "Start"
 msgctxt "cal-reminders"
@@ -8349,7 +8414,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:2264
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2290
 #, fuzzy
 #| msgid "_Send"
 msgctxt "cal-reminders"
@@ -8357,14 +8422,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:2283
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2309
 #, 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:2308
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2334
 #, fuzzy
 #| msgid "extra times every"
 msgctxt "cal-reminders"
@@ -8372,161 +8437,169 @@ 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:2345
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2371
 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:2347
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2373
 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:2349
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2375
 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:2386
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2412
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2569
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2456
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Oma _hälytysääni muistutukselles"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2467
 msgid "Select a sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2495
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2520
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2552
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
 msgstr "Lähetä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:484
 #, fuzzy
 #| msgid "_Schedule Meeting..."
 msgid "_Schedule"
 msgstr "_Järjestä kokous..."
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:486
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:92
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Yhteenveto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:341
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Sijainti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:474
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_Luokat…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+msgid "Edit as text"
+msgstr "_Muokkaa tekstinä"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+msgid "View as HTML"
+msgstr "Näytä HTML:nä"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:656
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "K_uvaus:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:892
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Verkkosivusto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1263
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1357
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1373
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1374
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1375
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1391
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1454
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1486
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1487
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1496
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1550
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1631
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1727
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
@@ -8534,7 +8607,7 @@ msgid "Show time as _busy"
 msgstr "Näytä aika _varattuna"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1961
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2148
 #, fuzzy
 #| msgid "None"
 msgctxt "ECompEditor"
@@ -8620,12 +8693,11 @@ msgid "attachment"
 msgstr "liite"
 
 #: ../src/calendar/gui/e-comp-editor.c:610
-#, fuzzy
 #| msgid "Send _updates to attendees"
 msgid "Sending notifications to attendees…"
-msgstr "Lähetä _päivitykset osallistujille"
+msgstr "Lähetetään ilmoitukset osanottajille…"
 
-#: ../src/calendar/gui/e-comp-editor.c:985 ../src/e-util/e-webdav-browser.c:1818
+#: ../src/calendar/gui/e-comp-editor.c:985 ../src/e-util/e-webdav-browser.c:1799
 msgid "Saving changes…"
 msgstr "Tallennetaan muutoksia…"
 
@@ -8634,18 +8706,18 @@ msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/composer/e-composer-actions.c:333
 #: ../src/e-util/e-accounts-window.c:1778 ../src/e-util/e-html-editor-dialog.c:194
-#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-mail-signature-editor.c:319
 #: ../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:144
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:964
+#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:166
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:1015
 #: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1458
 #: ../src/mail/em-subscription-editor.c:1741
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:314
-#: ../src/shell/e-shell-window-actions.c:842
+#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:882
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Sulje"
@@ -8655,38 +8727,38 @@ msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:151
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:863
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1072 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:468 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:903
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:173
-#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
-#: ../src/e-util/e-web-view.c:2080 ../src/mail/e-mail-browser.c:153
-#: ../src/shell/e-shell-window-actions.c:865
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:470
+#: ../src/e-util/e-web-view.c:1994 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:870
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1079 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:166
-#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2089
-#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:872
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2003
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:187
-#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:879
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
+#: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
+#: ../src/shell/e-shell-window-actions.c:919
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
@@ -8695,43 +8767,43 @@ msgid "View help"
 msgstr "Näytä ohje"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:898
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1086 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:180
-#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2098
-#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:900
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2012
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069 ../src/composer/e-composer-actions.c:373
-#: ../src/mail/e-mail-reader.c:2750
+#: ../src/calendar/gui/e-comp-editor.c:2069 ../src/composer/e-composer-actions.c:387
+#: ../src/mail/e-mail-reader.c:2749
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
 msgstr "_Tulosta…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2757
+#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
 msgid "Pre_view…"
 msgstr "_Esikatselu…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
-#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:968
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:1100 ../src/e-util/e-web-view.c:485
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1015
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:194
-#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:970
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1017
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
@@ -8739,23 +8811,25 @@ msgstr "Valitse kaikki teksti"
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-html-editor-actions.c:961
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:188
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1012
+#: ../src/calendar/gui/e-comp-editor.c:2120
+#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1059
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/calendar/gui/e-comp-editor.c:2134 ../src/e-util/e-html-editor-actions.c:982
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/e-util/e-html-editor-actions.c:1144
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/composer/e-composer-actions.c:363
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "_Asetukset"
 
 #: ../src/calendar/gui/e-comp-editor.c:2148
-#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:202
-#: ../src/shell/e-shell-window-actions.c:1055
+#: ../src/e-util/e-html-editor-actions.c:1165 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1102
 #: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
@@ -8765,7 +8839,7 @@ msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
 #: ../src/calendar/gui/e-comp-editor.c:2165
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
+#: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
@@ -8776,16 +8850,16 @@ msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 #. String to use in 12-hour time format for times in the morning.
 #: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
 #: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
-#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2647
-#: ../src/calendar/gui/print.c:2667
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
+#: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
 #: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
-#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2652
-#: ../src/calendar/gui/print.c:2669
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
+#: ../src/calendar/gui/print.c:2685
 msgid "pm"
 msgstr "pm"
 
@@ -8797,7 +8871,7 @@ msgstr "pm"
 #. * anything.
 #: ../src/calendar/gui/e-day-view.c:3046
 #: ../src/calendar/gui/e-day-view-top-item.c:850
-#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2109
+#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2117
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -8860,51 +8934,51 @@ msgstr "Osanottajat"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1253
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:112
-#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1254
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
 #: ../src/calendar/gui/e-meeting-store.c:114
-#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1255
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:116
-#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1256
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "Huone"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:145
-#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1271
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:149
-#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1272
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:151
-#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1273
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
@@ -8915,12 +8989,8 @@ msgstr "Ei läsnä"
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:624
-msgid "Attendee                          "
-msgstr "Osallistuja                          "
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:679
+#: ../src/calendar/gui/e-meeting-list-view.c:678
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
@@ -8963,10 +9033,8 @@ msgid "No Information"
 msgstr "Ei tietoa"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-#, fuzzy
-#| msgid "Atte_ndees"
 msgid "Atte_ndees…"
-msgstr "_Osanottajat"
+msgstr "_Osanottajat…"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
@@ -9029,7 +9097,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3554
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3616
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -9144,7 +9212,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:1148
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:1145
 msgid "Complete"
 msgstr "Valmis"
 
@@ -9187,22 +9255,22 @@ msgstr "Erääntyy: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
 #: ../src/calendar/gui/e-to-do-pane.c:442
-#, fuzzy, c-format
+#, c-format
 #| msgid "Completed "
 msgid "Completed: %s"
-msgstr "Valmis "
+msgstr "Valmis: %s"
 
 #. strftime format of a weekday and a date.
 #: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
-#: ../src/modules/itip-formatter/itip-view.c:254
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
 #: ../src/calendar/gui/e-to-do-pane.c:1578 ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:282
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow"
 msgstr "Huomenna"
 
@@ -9266,10 +9334,8 @@ msgstr "Te_htävää"
 #. Translators: the first '%s' is replaced with a component summary;
 #. the second '%s' is replaced with an event location.
 #. Example: "Meet John Doe (Central Park)"
-#: ../src/calendar/gui/e-week-view.c:3705
+#: ../src/calendar/gui/e-week-view.c:3703
 #, c-format
-#| msgctxt "language"
-#| msgid "%s (%s)"
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9277,7 +9343,7 @@ msgstr "%s (%s)"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2088
+#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -9403,24 +9469,24 @@ msgstr "Resurssin varaaminen ei onnistu, virhe:"
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../src/calendar/gui/itip-utils.c:2311
+#: ../src/calendar/gui/itip-utils.c:2312
 msgid "Sending an event"
 msgstr "Lähetetään tapahtuma"
 
-#: ../src/calendar/gui/itip-utils.c:2315
+#: ../src/calendar/gui/itip-utils.c:2316
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../src/calendar/gui/itip-utils.c:2319
+#: ../src/calendar/gui/itip-utils.c:2320
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
 msgstr "Lähetys"
 
 #. Translator: This is used as a placeholder when an event doesn't have set a location
-#: ../src/calendar/gui/itip-utils.c:2571
+#: ../src/calendar/gui/itip-utils.c:2572
 msgctxt "Location"
 msgid "Unspecified"
 msgstr "Määrittämätön"
@@ -9494,78 +9560,78 @@ msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3346
+#: ../src/calendar/gui/print.c:3408
 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:3356
+#: ../src/calendar/gui/print.c:3418
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3362
+#: ../src/calendar/gui/print.c:3424
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3372
+#: ../src/calendar/gui/print.c:3434
 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:3379
+#: ../src/calendar/gui/print.c:3441
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../src/calendar/gui/print.c:3524
+#: ../src/calendar/gui/print.c:3586
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../src/calendar/gui/print.c:3526 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3588 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/gui/print.c:3528
+#: ../src/calendar/gui/print.c:3590
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/gui/print.c:3585
+#: ../src/calendar/gui/print.c:3647
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../src/calendar/gui/print.c:3614
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../src/calendar/gui/print.c:3630
+#: ../src/calendar/gui/print.c:3692
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../src/calendar/gui/print.c:3645
+#: ../src/calendar/gui/print.c:3707
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../src/calendar/gui/print.c:3660
+#: ../src/calendar/gui/print.c:3722
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3676
+#: ../src/calendar/gui/print.c:3738
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../src/calendar/gui/print.c:3688
+#: ../src/calendar/gui/print.c:3750
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -9598,15 +9664,15 @@ msgstr "Tapaamiset ja kokoukset"
 
 #: ../src/calendar/importers/icalendar-importer.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:88
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:267
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:89
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
 #: ../src/calendar/importers/icalendar-importer.c:330
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:275
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
@@ -11349,144 +11415,143 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../src/composer/e-composer-actions.c:226
+#: ../src/composer/e-composer-actions.c:240
 msgid "Save as…"
 msgstr "Tallenna nimellä…"
 
-#: ../src/composer/e-composer-actions.c:321
+#: ../src/composer/e-composer-actions.c:335
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../src/composer/e-composer-actions.c:326
+#: ../src/composer/e-composer-actions.c:340
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../src/composer/e-composer-actions.c:328
+#: ../src/composer/e-composer-actions.c:342
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1469
-#: ../src/shell/e-shell-window-actions.c:912
+#: ../src/composer/e-composer-actions.c:347 ../src/shell/e-shell-window-actions.c:952
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:914
+#: ../src/composer/e-composer-actions.c:349 ../src/shell/e-shell-window-actions.c:954
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../src/composer/e-composer-actions.c:342
+#: ../src/composer/e-composer-actions.c:356
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../src/composer/e-composer-actions.c:347
+#: ../src/composer/e-composer-actions.c:361
 msgid "Save _As…"
 msgstr "Tallenna _nimellä…"
 
-#: ../src/composer/e-composer-actions.c:349
+#: ../src/composer/e-composer-actions.c:363
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../src/composer/e-composer-actions.c:356
+#: ../src/composer/e-composer-actions.c:370
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../src/composer/e-composer-actions.c:380
+#: ../src/composer/e-composer-actions.c:394
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../src/composer/e-composer-actions.c:387
+#: ../src/composer/e-composer-actions.c:401
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../src/composer/e-composer-actions.c:389
+#: ../src/composer/e-composer-actions.c:403
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../src/composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:408
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../src/composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:410
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:418
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:420
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:426
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:428
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:434
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:436
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Näytä kokoelma kuvia, joita voi raahata viesteihin"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:442
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:444
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:450
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:452
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:458
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:460
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:466
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:468
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../src/composer/e-composer-actions.c:508
+#: ../src/composer/e-composer-actions.c:522
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../src/composer/e-composer-actions.c:510
+#: ../src/composer/e-composer-actions.c:524
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:530
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:532
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:538
 msgid "_From Override Field"
 msgstr "_Lähettäjän korvauskenttä"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:540
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid ""
@@ -11494,33 +11559,33 @@ msgid ""
 "displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:546
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:548
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:554
 msgid "Visually _Wrap Long Lines"
 msgstr "_Rivitä visuaalisesti pitkät rivit"
 
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:611
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:617
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2003
+#: ../src/e-util/e-collection-account-wizard.c:2033
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2417
+#: ../src/e-util/e-webdav-browser.c:2398
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
-#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/mail/e-mail-config-summary-page.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Nimi:"
@@ -11582,25 +11647,51 @@ 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:1003
+#: ../src/composer/e-msg-composer.c:1036
 #, 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:1012
+#: ../src/composer/e-msg-composer.c:1045
 #, 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:1802 ../src/composer/e-msg-composer.c:2476
+#: ../src/composer/e-msg-composer.c:1818 ../src/composer/e-msg-composer.c:2492
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../src/composer/e-msg-composer.c:5006
+#: ../src/composer/e-msg-composer.c:4362
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
+#, fuzzy
+#| msgid "Loading Remote Content"
+msgid "Reading text content…"
+msgstr "Etäsisällön lataaminen"
+
+#: ../src/composer/e-msg-composer.c:5172
+#, fuzzy
+#| msgid "Remove attachments"
+msgid "Review attachment before sending."
+msgid_plural "Review attachments before sending."
+msgstr[0] "Poista liitteet"
+msgstr[1] "Poista liitteet"
+
+#: ../src/composer/e-msg-composer.c:5177
+#, c-format
+msgid ""
+"There had been added %d attachment. Make sure it does not contain any sensitive "
+"information before sending the message."
+msgid_plural ""
+"There had been added %d attachments. Make sure they do not contain any sensitive "
+"information before sending the message."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/composer/e-msg-composer.c:5310
 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)"
@@ -11642,10 +11733,8 @@ msgid "_Recover"
 msgstr "_Palauta"
 
 #: ../src/composer/mail-composer.error.xml.h:9
-#, fuzzy
-#| msgid "Do you want to recover unfinished messages?"
 msgid "Do you want to recover last saved version of the message?"
-msgstr "Haluatko palauttaa viimeistelemättömät viestit?"
+msgstr "Haluatko palauttaa viimeisimmän tallennetun version viestistä?"
 
 #: ../src/composer/mail-composer.error.xml.h:10
 msgid ""
@@ -11654,10 +11743,9 @@ msgid ""
 msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:11
-#, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Could not save to autosave file “{0}”."
-msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
+msgstr "Ei voitu tallentaa automaattisesti tiedostoa “{0}”."
 
 #: ../src/composer/mail-composer.error.xml.h:12
 #, fuzzy
@@ -11753,7 +11841,7 @@ msgid "_Save to Outbox"
 msgstr "_Tallenna lähteviin"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:675
+#: ../src/e-util/e-collection-account-wizard.c:694
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
@@ -11893,20 +11981,26 @@ msgstr "Äänisoitin"
 msgid "Play the attachment in embedded audio player"
 msgstr "Toista liite upotetussa äänisoittimessa"
 
-#: ../src/em-format/e-mail-formatter-headers.c:108
+#: ../src/em-format/e-mail-formatter-headers.c:109
 #: ../src/em-format/e-mail-part-headers.c:46 ../src/mail/e-mail-tag-editor.c:196
 #: ../src/mail/message-list.etspec.h:5 ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../src/em-format/e-mail-formatter-headers.c:133
+#: ../src/em-format/e-mail-formatter-headers.c:134
 msgid "(no subject)"
 msgstr "(Ei aihetta)"
 
-#. Translators: This message suggests to the receipients
+#: ../src/em-format/e-mail-formatter-headers.c:150
+#: ../src/em-format/e-mail-formatter-headers.c:514
+#: ../src/mail/e-mail-remote-content-popover.c:381
+msgid "Remote content download had been blocked for this message."
+msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
+
+#. Translators: This message suggests to the recipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:344
+#: ../src/em-format/e-mail-formatter-headers.c:359
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
@@ -11931,14 +12025,14 @@ msgstr "RFC822-viesti"
 msgid "Format part as an RFC822 message"
 msgstr "Muotoillaan viestiä"
 
-#: ../src/em-format/e-mail-formatter-print.c:51 ../src/e-util/e-webdav-browser.c:2361
+#: ../src/em-format/e-mail-formatter-print.c:50 ../src/e-util/e-webdav-browser.c:2342
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print.c:50
 #: ../src/e-util/e-attachment-tree-view.c:193 ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
@@ -11956,8 +12050,8 @@ msgstr "Aihe"
 #: ../src/em-format/e-mail-formatter-quote-headers.c:200
 #: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
-#: ../src/modules/mail/em-mailer-prefs.c:1619
-#: ../src/modules/mail/em-mailer-prefs.c:1668
+#: ../src/modules/mail/em-mailer-prefs.c:1620
+#: ../src/modules/mail/em-mailer-prefs.c:1669
 msgid "Mailer"
 msgstr "Postittaja"
 
@@ -11972,19 +12066,18 @@ msgid "Display part as enriched text"
 msgstr ""
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:385
+#: ../src/em-format/e-mail-formatter-text-html.c:389
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:390
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1346
 msgid "Plain Text"
 msgstr "Raakateksti"
 
@@ -11995,26 +12088,28 @@ msgstr "Raakateksti"
 msgid "Format part as plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is authentic."
 msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on varmasti "
 "se, jolta viesti näyttää olevan."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but sender address and signer address do not match"
 msgstr ""
+"Kelvollinen allekirjoitus, mutta lähettäjän osoite ja allekirjoittajan osoite "
+"eivät täsmää"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:51
+#: ../src/em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12022,11 +12117,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin todennäköisesti "
 "aito."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:53
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:55
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "The signature of this message cannot be verified, it may have been altered in "
 "transit."
@@ -12034,11 +12129,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:62
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12046,17 +12141,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta viestin "
 "lähettäjää ei voi varmistaa."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:61
-#, fuzzy
-#| msgid ""
-#| "This message is signed with a signature, but there is no corresponding public "
-#| "key."
+#: ../src/em-format/e-mail-formatter-secure-button.c:66
 msgid "This message is signed, but the public key is not in your keyring"
-msgstr ""
-"Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta viestin "
-"lähettäjän julkista avainta ei löydy."
+msgstr "Tämä viesti on allekirjoitettu, mutta julkinen avain ei ole avainnipussasi"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:63
+#: ../src/em-format/e-mail-formatter-secure-button.c:68
 msgid ""
 "This message was digitally signed, but the corresponding public key is not present "
 "in your keyring. If you want to be able to verify the authenticity of messages "
@@ -12065,11 +12154,11 @@ msgid ""
 "came from that person and that it arrived unaltered."
 msgstr ""
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:72
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:72
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across the "
 "Internet."
@@ -12077,11 +12166,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa Internetin "
 "läpi."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:73
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:73
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this message "
@@ -12091,22 +12180,22 @@ msgstr ""
 "että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön melko lyhyessä "
 "ajassa."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:74
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:74
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view the "
 "content of this message."
 msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö luettavakseen."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:75
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:75
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be very "
 "difficult for an outsider to view the content of this message in a practical "
@@ -12115,6 +12204,36 @@ msgstr ""
 "Tämä viesti on salattu hyvällä salausalgoritmilla. Ulkopuolisen on hyvin vaikea "
 "purkaa salausta ja nähdä tämän viestin sisältöä missään käytännöllisessä ajassa."
 
+#: ../src/em-format/e-mail-formatter-secure-button.c:271
+msgid "View Certificate"
+msgstr "Näytä varmenne"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:278
+msgid "Import Certificate"
+msgstr "Tuo varmenne"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:320
+msgid "Details"
+msgstr "Tiedot"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:412
+msgid "Digital Signature"
+msgstr "Digitaalinen allekirjoitus"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:418
+msgid "Signer:"
+msgid_plural "Signers:"
+msgstr[0] "Allekirjoittaja:"
+msgstr[1] "Allekirjoita"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:429
+msgid "Encryption"
+msgstr "Salaus"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:434
+msgid "Encrypted by:"
+msgstr "Salannut:"
+
 #: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr ""
@@ -12254,8 +12373,8 @@ msgstr "Allekirjoituksen muoto ei ole tuettu"
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
-#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
+#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "Päiväys"
@@ -12269,24 +12388,11 @@ msgstr "Uutisryhmät"
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../src/em-format/e-mail-part-secure-button.c:92
+#: ../src/em-format/e-mail-part-secure-button.c:96
 #, c-format
 msgid "Failed to import certificate: %s"
 msgstr "Varmenteen tuonti epäonnistui: %s"
 
-#: ../src/em-format/e-mail-part-secure-button.c:185 ../src/shell/shell.error.xml.h:28
-#: ../src/smime/gui/smime-ui.ui.h:16
-msgid "_View Certificate"
-msgstr "_Näytä varmenne"
-
-#: ../src/em-format/e-mail-part-secure-button.c:198
-msgid "_Import Certificate"
-msgstr "_Tuo varmenne"
-
-#: ../src/em-format/e-mail-part-secure-button.c:207
-msgid "This certificate is not viewable"
-msgstr "Tätä varmennetta ei voi näyttää"
-
 #: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
@@ -12307,7 +12413,7 @@ msgstr "evolutionin kalenterin kohta"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:910
+#: ../src/modules/mail/e-mail-shell-backend.c:914
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
@@ -12318,7 +12424,7 @@ msgstr "Osoitekirjat"
 
 #: ../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:86
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -12329,7 +12435,7 @@ msgstr "Muistilappulistat"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Task Lists"
 msgstr "Tehtävälistat"
 
@@ -12382,7 +12488,7 @@ msgstr "Evolution-tilit"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2689
 #: ../src/mail/em-subscription-editor.c:1952
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1600
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1678
@@ -12439,7 +12545,7 @@ msgid "Cancel"
 msgstr "Peru"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:125
+#: ../src/e-util/e-alert-bar.c:204
 msgid "Close this message (Escape)"
 msgstr "Sulje tämä viesti (Escape)"
 
@@ -12513,8 +12619,8 @@ msgstr "_Tiedostonimi:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:229
-#: ../src/e-util/e-webdav-browser.c:2456
+#: ../src/e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-webdav-browser.c:2437
 msgid "_Description:"
 msgstr "K_uvaus:"
 
@@ -12563,7 +12669,7 @@ msgstr "Lii_tä"
 
 #: ../src/e-util/e-attachment-store.c:721
 msgid "Archive selected directories using this format:"
-msgstr ""
+msgstr "Arkistoi valitut kansiot käyttäen tätä muotoa:"
 
 #: ../src/e-util/e-attachment-store.c:838
 msgid "Save Attachment"
@@ -12646,11 +12752,6 @@ msgstr "Täydennä automaattisesti tästä osoitekirjasta"
 msgid "Copy book content locally for offline operation"
 msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../src/e-util/e-buffer-tagger.c:410
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl-napsauta avataksesi linkin"
-
 #: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
@@ -12794,7 +12895,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:2143
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
@@ -12929,7 +13030,7 @@ msgid "_Look Up"
 msgstr "_Ohita haku"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
-#: ../src/e-util/e-collection-account-wizard.c:273 ../src/e-util/e-search-bar.c:677
+#: ../src/e-util/e-collection-account-wizard.c:273 ../src/e-util/e-search-bar.c:680
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -12939,7 +13040,7 @@ msgstr "_Seuraava"
 msgid "New Collection Account"
 msgstr "Uusi kokoelmatili"
 
-#: ../src/e-util/e-collection-account-wizard.c:258 ../src/e-util/e-search-bar.c:665
+#: ../src/e-util/e-collection-account-wizard.c:258 ../src/e-util/e-search-bar.c:668
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_Edellinen"
@@ -12958,115 +13059,124 @@ msgstr "Salasana vaaditaan jatkamiseksi. %s."
 msgid "View certificate"
 msgstr "Näytä varmenne"
 
-#. Translators: The first %s is replaced with actual error message about site certificate invalidity,
-#. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:513
-#, c-format
-msgctxt "collection-account-wizard"
-msgid "%s %s."
-msgstr "%s %s."
-
-#: ../src/e-util/e-collection-account-wizard.c:551
+#: ../src/e-util/e-collection-account-wizard.c:550
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter the "
 "account manually instead or change above settings."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:553
+#: ../src/e-util/e-collection-account-wizard.c:552
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/e-util/e-collection-account-wizard.c:657
+#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "Käyttäjät_unnus:"
+
+#: ../src/e-util/e-collection-account-wizard.c:675
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/e-util/e-collection-account-wizard.c:669
+#: ../src/e-util/e-collection-account-wizard.c:688
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../src/e-util/e-collection-account-wizard.c:812
+#: ../src/e-util/e-collection-account-wizard.c:835
 #: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../src/e-util/e-collection-account-wizard.c:813
+#: ../src/e-util/e-collection-account-wizard.c:836
 #, fuzzy
 #| msgid "Mail Receipt"
 msgid "Mail Receive"
 msgstr "Sähköpostin vastaanotto"
 
-#: ../src/e-util/e-collection-account-wizard.c:814
+#: ../src/e-util/e-collection-account-wizard.c:837
 #, fuzzy
 #| msgid "Mailer"
 msgid "Mail Send"
 msgstr "Postittaja"
 
-#: ../src/e-util/e-collection-account-wizard.c:815
+#: ../src/e-util/e-collection-account-wizard.c:838
 #: ../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:817
+#: ../src/e-util/e-collection-account-wizard.c:840
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "Memo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-collection-account-wizard.c:818
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/e-util/e-collection-account-wizard.c:841
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-collection-account-wizard.c:1154
+#: ../src/e-util/e-collection-account-wizard.c:1177
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1461
+#: ../src/e-util/e-collection-account-wizard.c:1310
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Failed to store password: "
+msgstr "Viestien merkitseminen luetuiksi epäonnistui."
+
+#: ../src/e-util/e-collection-account-wizard.c:1320
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Failed to create sources: "
+msgstr "Viestien merkitseminen luetuiksi epäonnistui."
+
+#: ../src/e-util/e-collection-account-wizard.c:1487
 msgid "Saving account settings, please wait…"
 msgstr "Tallennetaan tilin asetuksia, odota hetki…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1612
+#: ../src/e-util/e-collection-account-wizard.c:1639
 msgid "User details"
 msgstr "Käyttäjän tiedot"
 
-#: ../src/e-util/e-collection-account-wizard.c:1625
+#: ../src/e-util/e-collection-account-wizard.c:1652
 msgid "_Email Address or User name:"
 msgstr "S_ähköpostiosoite tai käyttäjätunnus:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1656
+#: ../src/e-util/e-collection-account-wizard.c:1683
 msgid "_Advanced Options"
 msgstr "_Lähetysasetukset"
 
-#: ../src/e-util/e-collection-account-wizard.c:1661
+#: ../src/e-util/e-collection-account-wizard.c:1688
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1680
+#: ../src/e-util/e-collection-account-wizard.c:1707
 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:1870
+#: ../src/e-util/e-collection-account-wizard.c:1900
 #, 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:1994
+#: ../src/e-util/e-collection-account-wizard.c:2024
 #: ../src/mail/e-mail-config-identity-page.c:542
-#: ../src/mail/e-mail-config-summary-page.c:323
+#: ../src/mail/e-mail-config-summary-page.c:325
 msgid "Account Information"
 msgstr "Tilitiedot"
 
@@ -13074,230 +13184,231 @@ msgstr "Tilitiedot"
 msgid "Choose custom color"
 msgstr "Käytä omavalintainen väri"
 
-#: ../src/e-util/e-color-combo.c:76
+#: ../src/e-util/e-color-combo.c:488 ../src/e-util/e-html-editor.c:127
+#: ../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:4870
+#: ../src/mail/mail-config.ui.h:78
+msgid "Default"
+msgstr "Oletukset"
+
+#: ../src/e-util/e-color-combo.c:576
 msgid "black"
 msgstr "musta"
 
-#: ../src/e-util/e-color-combo.c:77
+#: ../src/e-util/e-color-combo.c:577
 msgid "light brown"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:78
+#: ../src/e-util/e-color-combo.c:578
 msgid "brown gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:579
 msgid "dark green #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:580
 msgid "navy"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:581
 msgid "dark blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:582
 msgid "purple #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:583
 msgid "very dark gray"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:585
 #, fuzzy
 #| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:586
 msgid "red-orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:87
+#: ../src/e-util/e-color-combo.c:587
 msgid "gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:588
 msgid "dark green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:589
 msgid "dull blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:590
 msgid "blue"
 msgstr "sininen"
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:591
 msgid "dull purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:592
 msgid "dark grey"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:594
 msgid "red"
 msgstr "punainen"
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:595
 msgid "orange"
 msgstr "oranssi"
 
-#: ../src/e-util/e-color-combo.c:96
+#: ../src/e-util/e-color-combo.c:596
 msgid "lime"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:597
 msgid "dull green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:598
 msgid "dull blue #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:599
 msgid "sky blue #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:600
 msgid "purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:601
 msgid "gray"
 msgstr "harmaa"
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:603
 #, fuzzy
 #| msgid "Image"
 msgid "magenta"
 msgstr "Kuva"
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:604
 msgid "bright orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:105
+#: ../src/e-util/e-color-combo.c:605
 msgid "yellow"
 msgstr "keltainen"
 
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:606
 msgid "green"
 msgstr "vihreä"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:607
 msgid "cyan"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:608
 msgid "bright blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:609
 #, fuzzy
 #| msgid "_Required people"
 msgid "red purple"
 msgstr "_Vaaditut henkilöt"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:610
 msgid "light grey"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:612
 msgid "pink"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:613
 msgid "light orange"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:114
+#: ../src/e-util/e-color-combo.c:614
 msgid "light yellow"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:615
 msgid "light green"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:616
 msgid "light cyan"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:617
 msgid "light blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:618
 msgid "light purple"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:619
 msgid "white"
 msgstr "valkoinen"
 
-#: ../src/e-util/e-color-combo.c:539 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4849
-#: ../src/mail/mail-config.ui.h:78
-msgid "Default"
-msgstr "Oletukset"
-
-#: ../src/e-util/e-config-lookup.c:821
+#: ../src/e-util/e-config-lookup.c:819
 msgid "Running…"
 msgstr "Suoritetaan…"
 
-#: ../src/e-util/e-dateedit.c:524
+#: ../src/e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../src/e-util/e-dateedit.c:549
+#: ../src/e-util/e-dateedit.c:558
 msgid "Text entry to input date"
 msgstr "Tekstikenttä päiväyksen syöttöön"
 
-#: ../src/e-util/e-dateedit.c:572
+#: ../src/e-util/e-dateedit.c:581
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:636
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../src/e-util/e-dateedit.c:628
+#: ../src/e-util/e-dateedit.c:637
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/e-util/e-dateedit.c:702
+#: ../src/e-util/e-dateedit.c:714
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../src/e-util/e-dateedit.c:709
+#: ../src/e-util/e-dateedit.c:721
 msgid "_Today"
 msgstr "_Tänään"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:718
+#: ../src/e-util/e-dateedit.c:730 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 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:2131
+#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
 msgctxt "date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/e-util/e-dateedit.c:2017
+#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../src/e-util/e-dateedit.c:2062
+#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
@@ -13657,23 +13768,23 @@ msgstr "Valitse aika johon verrataan"
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-filter-rule.c:979
+#: ../src/e-util/e-filter-rule.c:1061
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../src/e-util/e-filter-rule.c:1035
+#: ../src/e-util/e-filter-rule.c:1117
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../src/e-util/e-filter-rule.c:1036
+#: ../src/e-util/e-filter-rule.c:1118
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../src/e-util/e-filter-rule.c:1042
+#: ../src/e-util/e-filter-rule.c:1124
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../src/e-util/e-filter-rule.c:1065
+#: ../src/e-util/e-filter-rule.c:1147
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -13681,569 +13792,692 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1080 ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-filter-rule.c:1162 ../src/e-util/e-html-editor-page-dialog.c:62
 #: ../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:766
-#: ../src/mail/e-mail-config-summary-page.c:141
+#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:143
 #: ../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:1081
+#: ../src/e-util/e-filter-rule.c:1163
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../src/e-util/e-filter-rule.c:1082 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1164 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../src/e-util/e-filter-rule.c:1083
+#: ../src/e-util/e-filter-rule.c:1165
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../src/e-util/e-filter-rule.c:1084
+#: ../src/e-util/e-filter-rule.c:1166
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../src/e-util/e-filter-rule.c:1087
+#: ../src/e-util/e-filter-rule.c:1169
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../src/e-util/e-filter-rule.c:1165
+#: ../src/e-util/e-filter-rule.c:1247
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../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
+#: ../src/e-util/e-filter-rule.c:1567 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1044
+#: ../src/e-util/e-filter-rule.c:1567 ../src/mail/em-filter-rule.c:1043
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: ../src/e-util/e-html-editor-actions.c:80
+#: ../src/e-util/e-gtkemojichooser.c:753
+msgctxt "EmojiChooser"
+msgid "Recent"
+msgstr "Viimeisimmät"
+
+#: ../src/e-util/e-gtkemojichooser.c:757
+msgctxt "EmojiChooser"
+msgid "Smileys & People"
+msgstr "Hymiöt ja ihmiset"
+
+#: ../src/e-util/e-gtkemojichooser.c:758
+msgctxt "EmojiChooser"
+msgid "Body & Clothing"
+msgstr "Keho ja vaatetus"
+
+#: ../src/e-util/e-gtkemojichooser.c:759
+msgctxt "EmojiChooser"
+msgid "Animals & Nature"
+msgstr "Eläimet ja luonto"
+
+#: ../src/e-util/e-gtkemojichooser.c:760
+msgctxt "EmojiChooser"
+msgid "Food & Drink"
+msgstr "Ruoka ja juoma"
+
+#: ../src/e-util/e-gtkemojichooser.c:761
+msgctxt "EmojiChooser"
+msgid "Travel & Places"
+msgstr "Matkustaminen ja sijainnit"
+
+#: ../src/e-util/e-gtkemojichooser.c:762
+msgctxt "EmojiChooser"
+msgid "Activities"
+msgstr "Aktiviteetit"
+
+#: ../src/e-util/e-gtkemojichooser.c:763
+msgctxt "EmojiChooser"
+msgid "Objects"
+msgstr "Objektit"
+
+#: ../src/e-util/e-gtkemojichooser.c:764
+msgctxt "EmojiChooser"
+msgid "Symbols"
+msgstr "Symbolit"
+
+#: ../src/e-util/e-gtkemojichooser.c:765
+msgctxt "EmojiChooser"
+msgid "Flags"
+msgstr "Liput"
+
+#: ../src/e-util/e-gtkemojichooser.c:789
+msgctxt "EmojiChooser"
+msgid "No Results Found"
+msgstr "Tuloksia ei löytynyt"
+
+#: ../src/e-util/e-gtkemojichooser.c:797
+msgctxt "EmojiChooser"
+msgid "Try a different search"
+msgstr "Kokeile eri hakuehtoja"
+
+#: ../src/e-util/e-html-editor-actions.c:81
 msgid "Failed to insert HTML file."
 msgstr "HTML-tiedoston sisällyttäminen epäonnistui."
 
-#: ../src/e-util/e-html-editor-actions.c:118
+#: ../src/e-util/e-html-editor-actions.c:119
 msgid "Failed to insert text file."
 msgstr "Tekstitiedoston sisällyttäminen epäonnistui."
 
-#: ../src/e-util/e-html-editor-actions.c:302
+#: ../src/e-util/e-html-editor-actions.c:340
 msgid "Insert HTML File"
 msgstr "Syötä HTML-tiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:307
+#: ../src/e-util/e-html-editor-actions.c:345
 msgid "HTML file"
 msgstr "HTML-tiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:345
-#: ../src/e-util/e-html-editor-actions.c:355
+#: ../src/e-util/e-html-editor-actions.c:383
+#: ../src/e-util/e-html-editor-actions.c:401
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Sisällytä kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:352
-msgid "Image file"
-msgstr "Kuvatiedosto"
+#: ../src/e-util/e-html-editor-actions.c:390
+#: ../src/e-util/e-html-editor-actions.c:408
+#: ../src/e-util/e-image-chooser-dialog.c:188 ../src/plugins/face/face.c:301
+msgid "Image files"
+msgstr "Kuvatiedostot"
 
-#: ../src/e-util/e-html-editor-actions.c:428
+#: ../src/e-util/e-html-editor-actions.c:487
 msgid "Insert text file"
 msgstr "Sisällytä tekstitiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:433
+#: ../src/e-util/e-html-editor-actions.c:492
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:912
+#: ../src/e-util/e-html-editor-actions.c:1074
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../src/e-util/e-html-editor-actions.c:919
+#: ../src/e-util/e-html-editor-actions.c:1081
 msgid "Cut selected text to the clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:926
+#: ../src/e-util/e-html-editor-actions.c:1088
 msgid "Paste text from the clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
-#: ../src/e-util/e-html-editor-actions.c:933
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "Redo the last undone action"
 msgstr "Tee uudelleen viimeisin kumottu toiminto"
 
-#: ../src/e-util/e-html-editor-actions.c:947
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../src/e-util/e-html-editor-actions.c:968
+#: ../src/e-util/e-html-editor-actions.c:1130
 msgid "For_mat"
 msgstr "_Muotoilu"
 
-#: ../src/e-util/e-html-editor-actions.c:975
+#: ../src/e-util/e-html-editor-actions.c:1137
 msgid "_Paragraph Style"
 msgstr "_Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor-actions.c:989
+#: ../src/e-util/e-html-editor-actions.c:1151
 #: ../src/e-util/e-html-editor-image-dialog.c:590
 msgid "_Alignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-html-editor-actions.c:996
+#: ../src/e-util/e-html-editor-actions.c:1158
 msgid "Current _Languages"
 msgstr "_Nykyiset kielet"
 
-#: ../src/e-util/e-html-editor-actions.c:1013
+#: ../src/e-util/e-html-editor-actions.c:1175
 msgid "_Increase Indent"
 msgstr "_Lisää sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1015
+#: ../src/e-util/e-html-editor-actions.c:1177
 msgid "Increase Indent"
 msgstr "Lisää sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1020
+#: ../src/e-util/e-html-editor-actions.c:1182
+#: ../src/e-util/e-html-editor-actions.c:2212
+msgid "E_moji"
+msgstr "E_moji"
+
+#: ../src/e-util/e-html-editor-actions.c:1184
+#: ../src/e-util/e-html-editor-actions.c:1191
+#| msgid "Insert Emoticon"
+msgid "Insert Emoji"
+msgstr "Lisää emoji"
+
+#: ../src/e-util/e-html-editor-actions.c:1189
+#| msgid "Insert Emoticon"
+msgid "Insert E_moji"
+msgstr "Lisää e_moji"
+
+#: ../src/e-util/e-html-editor-actions.c:1196
 msgid "_HTML File…"
 msgstr "_HTML-tiedosto…"
 
-#: ../src/e-util/e-html-editor-actions.c:1027
+#: ../src/e-util/e-html-editor-actions.c:1203
 msgid "Te_xt File…"
 msgstr "Te_kstitiedosto…"
 
-#: ../src/e-util/e-html-editor-actions.c:1034
+#: ../src/e-util/e-html-editor-actions.c:1210
 msgid "Paste _Quotation"
 msgstr "_Liitä lainaus"
 
-#: ../src/e-util/e-html-editor-actions.c:1041
+#: ../src/e-util/e-html-editor-actions.c:1217
 msgid "_Find…"
 msgstr "_Etsi…"
 
-#: ../src/e-util/e-html-editor-actions.c:1043
+#: ../src/e-util/e-html-editor-actions.c:1219
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: ../src/e-util/e-html-editor-actions.c:1048
+#: ../src/e-util/e-html-editor-actions.c:1224
 msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
-#: ../src/e-util/e-html-editor-actions.c:1055
+#: ../src/e-util/e-html-editor-actions.c:1231
 msgid "Re_place…"
 msgstr "_Korvaa…"
 
-#: ../src/e-util/e-html-editor-actions.c:1057
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: ../src/e-util/e-html-editor-actions.c:1062
+#: ../src/e-util/e-html-editor-actions.c:1238
 msgid "Check _Spelling…"
 msgstr "_Oikolue…"
 
-#: ../src/e-util/e-html-editor-actions.c:1069
+#: ../src/e-util/e-html-editor-actions.c:1245
 msgid "_Decrease Indent"
 msgstr "_Vähennä sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1071
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "Decrease Indent"
 msgstr "Vähennä sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1076
+#: ../src/e-util/e-html-editor-actions.c:1252
 msgid "_Wrap Lines"
 msgstr "_Rivitä teksti"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1086
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
+#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:109
 msgid "_Center"
 msgstr "_Keskelle"
 
-#: ../src/e-util/e-html-editor-actions.c:1088
+#: ../src/e-util/e-html-editor-actions.c:1264
 msgid "Center Alignment"
 msgstr "Tasaus keskelle"
 
+#. Justified
+#: ../src/e-util/e-html-editor-actions.c:1269
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:127
+#, fuzzy
+#| msgid "Last modified"
+msgid "_Justified"
+msgstr "Viimeksi muokattu"
+
+#: ../src/e-util/e-html-editor-actions.c:1271
+msgid "Align Justified"
+msgstr ""
+
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1093
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
+#: ../src/e-util/e-html-editor-actions.c:1276
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:100
 msgid "_Left"
 msgstr "_Vasemmalle"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1278
 msgid "Left Alignment"
 msgstr "Tasaus vasemmalle"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1100
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
+#: ../src/e-util/e-html-editor-actions.c:1283
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:118
 msgid "_Right"
 msgstr "_Oikealle"
 
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1285
 msgid "Right Alignment"
 msgstr "Tasaus oikealle"
 
-#: ../src/e-util/e-html-editor-actions.c:1110
+#: ../src/e-util/e-html-editor-actions.c:1293
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1112
+#: ../src/e-util/e-html-editor-actions.c:1295
 msgid "HTML editing mode"
 msgstr "HTML-muokkaustila"
 
-#: ../src/e-util/e-html-editor-actions.c:1117
+#: ../src/e-util/e-html-editor-actions.c:1300
 msgid "Plain _Text"
 msgstr "Raaka_teksti"
 
-#: ../src/e-util/e-html-editor-actions.c:1119
+#: ../src/e-util/e-html-editor-actions.c:1302
 msgid "Plain text editing mode"
 msgstr "Raakatekstin muokkaustila"
 
-#: ../src/e-util/e-html-editor-actions.c:1127
+#: ../src/e-util/e-html-editor-actions.c:1310
 msgid "_Normal"
 msgstr "_Tavallinen"
 
-#: ../src/e-util/e-html-editor-actions.c:1134
+#: ../src/e-util/e-html-editor-actions.c:1317
 msgid "Heading _1"
 msgstr "Otsake _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1141
+#: ../src/e-util/e-html-editor-actions.c:1324
 msgid "Heading _2"
 msgstr "Otsake _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1148
+#: ../src/e-util/e-html-editor-actions.c:1331
 msgid "Heading _3"
 msgstr "Otsake _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1155
+#: ../src/e-util/e-html-editor-actions.c:1338
 msgid "Heading _4"
 msgstr "Otsake _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1162
+#: ../src/e-util/e-html-editor-actions.c:1345
 msgid "Heading _5"
 msgstr "Otsake _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1169
+#: ../src/e-util/e-html-editor-actions.c:1352
 msgid "Heading _6"
 msgstr "Otsake _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1176
+#: ../src/e-util/e-html-editor-actions.c:1359
 msgid "_Preformatted"
 msgstr "_Esimuotoiltu"
 
-#: ../src/e-util/e-html-editor-actions.c:1183
+#: ../src/e-util/e-html-editor-actions.c:1366
 msgid "A_ddress"
 msgstr "_Osoite"
 
-#: ../src/e-util/e-html-editor-actions.c:1190
+#: ../src/e-util/e-html-editor-actions.c:1373
 msgid "_Bulleted List"
 msgstr "_Merkitty luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1197
+#: ../src/e-util/e-html-editor-actions.c:1380
 msgid "_Roman Numeral List"
 msgstr "_Roomalaisnumeerinen luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1204
+#: ../src/e-util/e-html-editor-actions.c:1387
 msgid "Numbered _List"
 msgstr "Numeerinen _luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1394
 msgid "_Alphabetical List"
 msgstr "_Aakkosellinen luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1227
-#: ../src/e-util/e-html-editor-actions.c:1265
+#: ../src/e-util/e-html-editor-actions.c:1410
+#: ../src/e-util/e-html-editor-actions.c:1448
 msgid "_Image…"
 msgstr "_Kuva…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1230
+#: ../src/e-util/e-html-editor-actions.c:1413
 msgid "Insert Image"
 msgstr "Sisällytä kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:1235
-#: ../src/e-util/e-html-editor-actions.c:1272
+#: ../src/e-util/e-html-editor-actions.c:1418
+#: ../src/e-util/e-html-editor-actions.c:1455
 msgid "_Link…"
 msgstr "_Linkki…"
 
-#: ../src/e-util/e-html-editor-actions.c:1237
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1243
-#: ../src/e-util/e-html-editor-actions.c:1287
+#: ../src/e-util/e-html-editor-actions.c:1426
+#: ../src/e-util/e-html-editor-actions.c:1470
 msgid "_Rule…"
 msgstr "_Viiva…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1246
+#: ../src/e-util/e-html-editor-actions.c:1429
 msgid "Insert Rule"
 msgstr "Lisää viiva"
 
-#: ../src/e-util/e-html-editor-actions.c:1251
-#: ../src/e-util/e-html-editor-actions.c:1294
+#: ../src/e-util/e-html-editor-actions.c:1434
+#: ../src/e-util/e-html-editor-actions.c:1477
 msgid "_Table…"
 msgstr "_Taulukko…"
 
-#: ../src/e-util/e-html-editor-actions.c:1253
+#: ../src/e-util/e-html-editor-actions.c:1436
 msgid "Insert Table"
 msgstr "Lisää taulukko"
 
-#: ../src/e-util/e-html-editor-actions.c:1258
+#: ../src/e-util/e-html-editor-actions.c:1441
 msgid "_Cell…"
 msgstr "_Solu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1279
+#: ../src/e-util/e-html-editor-actions.c:1462
 msgid "Pa_ge…"
 msgstr "Si_vu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1486
 msgid "Font _Size"
 msgstr "Fontin _koko"
 
-#: ../src/e-util/e-html-editor-actions.c:1310
+#: ../src/e-util/e-html-editor-actions.c:1493
 msgid "_Font Style"
 msgstr "_Fontin tyyli"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1500
 msgid "Paste As _Text"
 msgstr "Liitä _tekstinä"
 
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1511
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Lihavoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1513
 msgid "Bold"
 msgstr "Lihavoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1336
+#: ../src/e-util/e-html-editor-actions.c:1519
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Kursivoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1521
 msgid "Italic"
 msgstr "Kursivoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1344
-msgid "_Plain Text"
-msgstr "_Raakateksti"
-
-#: ../src/e-util/e-html-editor-actions.c:1352
+#: ../src/e-util/e-html-editor-actions.c:1527
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Yliviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1354
+#: ../src/e-util/e-html-editor-actions.c:1529
 msgid "Strikethrough"
 msgstr "Yliviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1360
+#: ../src/e-util/e-html-editor-actions.c:1535
+#, fuzzy
+#| msgid "S_cript:"
+msgid "Subs_cript"
+msgstr "_Skripti:"
+
+#: ../src/e-util/e-html-editor-actions.c:1537
+#, fuzzy
+#| msgid "_Subscribe"
+msgid "Subscript"
+msgstr "_Tilaa"
+
+#: ../src/e-util/e-html-editor-actions.c:1543
+#, fuzzy
+#| msgid "S_cript:"
+msgid "Su_perscript"
+msgstr "_Skripti:"
+
+#: ../src/e-util/e-html-editor-actions.c:1545
+#, fuzzy
+#| msgid "Description"
+msgid "Superscript"
+msgstr "Kuvaus"
+
+#: ../src/e-util/e-html-editor-actions.c:1551
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Alleviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1362
+#: ../src/e-util/e-html-editor-actions.c:1553
 msgid "Underline"
 msgstr "Alleviivattu"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1372
+#: ../src/e-util/e-html-editor-actions.c:1563
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1380
+#: ../src/e-util/e-html-editor-actions.c:1571
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1388
+#: ../src/e-util/e-html-editor-actions.c:1579
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1396
+#: ../src/e-util/e-html-editor-actions.c:1587
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1404
+#: ../src/e-util/e-html-editor-actions.c:1595
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1412
+#: ../src/e-util/e-html-editor-actions.c:1603
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1611
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1439
+#: ../src/e-util/e-html-editor-actions.c:1630
 msgid "Cell Contents"
 msgstr "Solun sisältö"
 
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1637
 msgid "Column"
 msgstr "Sarake"
 
-#: ../src/e-util/e-html-editor-actions.c:1453
+#: ../src/e-util/e-html-editor-actions.c:1644
 msgid "Row"
 msgstr "Rivi"
 
-#: ../src/e-util/e-html-editor-actions.c:1460
+#: ../src/e-util/e-html-editor-actions.c:1651
 msgid "Table"
 msgstr "Taulukko"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1661
 msgid "Table Delete"
 msgstr "Taulukon poisto"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1669
 msgid "Table Insert"
 msgstr "Taulukon lisäys"
 
-#: ../src/e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1676
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../src/e-util/e-html-editor-actions.c:1503
+#: ../src/e-util/e-html-editor-actions.c:1694
 msgid "Column After"
 msgstr "Sarake ennen"
 
-#: ../src/e-util/e-html-editor-actions.c:1510
+#: ../src/e-util/e-html-editor-actions.c:1701
 msgid "Column Before"
 msgstr "Sarake jälkeen"
 
-#: ../src/e-util/e-html-editor-actions.c:1517
+#: ../src/e-util/e-html-editor-actions.c:1708
 msgid "Insert _Link"
 msgstr "L_isää linkki"
 
-#: ../src/e-util/e-html-editor-actions.c:1524
+#: ../src/e-util/e-html-editor-actions.c:1715
 msgid "Row Above"
 msgstr "Rivi ylös"
 
-#: ../src/e-util/e-html-editor-actions.c:1531
+#: ../src/e-util/e-html-editor-actions.c:1722
 msgid "Row Below"
 msgstr "Rivi alas"
 
-#: ../src/e-util/e-html-editor-actions.c:1538
+#: ../src/e-util/e-html-editor-actions.c:1729
 msgid "Cell…"
 msgstr "Solu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1545
+#: ../src/e-util/e-html-editor-actions.c:1736
 msgid "Image…"
 msgstr "Kuva…"
 
-#: ../src/e-util/e-html-editor-actions.c:1552
+#: ../src/e-util/e-html-editor-actions.c:1743
 msgid "Link…"
 msgstr "Linkki…"
 
-#: ../src/e-util/e-html-editor-actions.c:1559
+#: ../src/e-util/e-html-editor-actions.c:1750
 msgid "Page…"
 msgstr "Sivu…"
 
-#: ../src/e-util/e-html-editor-actions.c:1566
+#: ../src/e-util/e-html-editor-actions.c:1757
 msgid "Paragraph…"
 msgstr "Kappale…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1574
+#: ../src/e-util/e-html-editor-actions.c:1765
 msgid "Rule…"
 msgstr "Viiva…"
 
-#: ../src/e-util/e-html-editor-actions.c:1581
+#: ../src/e-util/e-html-editor-actions.c:1772
 msgid "Table…"
 msgstr "Taulukko…"
 
-#: ../src/e-util/e-html-editor-actions.c:1588
+#: ../src/e-util/e-html-editor-actions.c:1779
 msgid "Text…"
 msgstr "Teksti…"
 
-#: ../src/e-util/e-html-editor-actions.c:1595
+#: ../src/e-util/e-html-editor-actions.c:1786
 msgid "Remove Link"
 msgstr "Poista linkki"
 
-#: ../src/e-util/e-html-editor-actions.c:1612
+#: ../src/e-util/e-html-editor-actions.c:1803
 msgid "Add Word to Dictionary"
 msgstr "Lisää sana sanastoon"
 
-#: ../src/e-util/e-html-editor-actions.c:1619
+#: ../src/e-util/e-html-editor-actions.c:1810
 msgid "Ignore Misspelled Word"
 msgstr "Ohita väärinkirjoitettu sana"
 
-#: ../src/e-util/e-html-editor-actions.c:1626
+#: ../src/e-util/e-html-editor-actions.c:1817
 msgid "Add Word To"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1635
+#: ../src/e-util/e-html-editor-actions.c:1826
 msgid "More Suggestions"
 msgstr "Lisää ehdotuksia"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1870
+#: ../src/e-util/e-html-editor-actions.c:2061
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
-#: ../src/e-util/e-html-editor-actions.c:1949
+#: ../src/e-util/e-html-editor-actions.c:2140
 msgid "_Emoticon"
 msgstr "_Hymiö"
 
-#: ../src/e-util/e-html-editor-actions.c:1950
+#: ../src/e-util/e-html-editor-actions.c:2141
 msgid "Insert Emoticon"
 msgstr "Lisää hymiö"
 
-#: ../src/e-util/e-html-editor-actions.c:2018
+#: ../src/e-util/e-html-editor-actions.c:2209
 msgid "Re_place"
 msgstr "_Korvaa"
 
-#: ../src/e-util/e-html-editor-actions.c:2021
+#: ../src/e-util/e-html-editor-actions.c:2215
 msgid "_Image"
 msgstr "_Kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:2024
+#: ../src/e-util/e-html-editor-actions.c:2218
 msgid "_Link"
 msgstr "_Linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:2028
+#: ../src/e-util/e-html-editor-actions.c:2222
 msgid "_Rule"
 msgstr "_Viiva"
 
-#: ../src/e-util/e-html-editor-actions.c:2031
+#: ../src/e-util/e-html-editor-actions.c:2225
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Taulukko"
 
-#: ../src/e-util/e-html-editor.c:743
+#: ../src/e-util/e-html-editor.c:863
 msgid "Paragraph Style"
 msgstr "Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor.c:757
+#: ../src/e-util/e-html-editor.c:877
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../src/e-util/e-html-editor.c:769
+#: ../src/e-util/e-html-editor.c:889
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../src/e-util/e-html-editor.c:779
+#: ../src/e-util/e-html-editor.c:900
+msgid "Background Color"
+msgstr "Taustaväri"
+
+#: ../src/e-util/e-html-editor.c:910
 msgid "Font Size"
 msgstr "Fontin koko"
 
+#: ../src/e-util/e-html-editor.c:919
+msgid "Font Name"
+msgstr "Fontin nimi"
+
+#: ../src/e-util/e-html-editor.c:1523
+#, fuzzy
+#| msgid "Failed to insert text file."
+msgid "Failed to obtain content of editor"
+msgstr "Tekstitiedoston sisällyttäminen epäonnistui."
+
 #: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr ""
@@ -14265,20 +14499,20 @@ msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
-#: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:648
+#: ../src/e-util/e-html-editor-hrule-dialog.c:306
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "Left"
 msgstr "Vasen"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
-#: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-table-dialog.c:640
 msgid "Center"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
-#: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-table-dialog.c:641
 msgid "Right"
 msgstr "Oikea"
 
@@ -14325,7 +14559,7 @@ msgstr "_Otsaketyyli"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
 #: ../src/e-util/e-html-editor-image-dialog.c:520
-#: ../src/e-util/e-html-editor-table-dialog.c:560
+#: ../src/e-util/e-html-editor-table-dialog.c:551
 msgid "<b>Layout</b>"
 msgstr "<b>Asettelu</b>"
 
@@ -14343,12 +14577,12 @@ msgid "Co_lumn Span:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:664
+#: ../src/e-util/e-html-editor-table-dialog.c:655
 msgid "<b>Background</b>"
 msgstr "<b>Tausta</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:677
+#: ../src/e-util/e-html-editor-table-dialog.c:668
 msgid "Transparent"
 msgstr "Läpinäkyvä"
 
@@ -14358,7 +14592,7 @@ msgstr "V_äri:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:640
 #: ../src/e-util/e-html-editor-image-dialog.c:476
-#: ../src/e-util/e-html-editor-table-dialog.c:692
+#: ../src/e-util/e-html-editor-table-dialog.c:683
 msgid "Images"
 msgstr "Kuvat"
 
@@ -14366,8 +14600,8 @@ msgstr "Kuvat"
 #: ../src/e-util/e-html-editor-cell-dialog.c:648
 #: ../src/e-util/e-html-editor-image-dialog.c:481
 #: ../src/e-util/e-html-editor-image-dialog.c:484
-#: ../src/e-util/e-html-editor-table-dialog.c:697
-#: ../src/e-util/e-html-editor-table-dialog.c:702
+#: ../src/e-util/e-html-editor-table-dialog.c:688
+#: ../src/e-util/e-html-editor-table-dialog.c:693
 msgid "Choose Background Image"
 msgstr "Valitse taustakuva"
 
@@ -14376,8 +14610,8 @@ msgid "_Image:"
 msgstr "_Kuva:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:669
-#: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:723
+#: ../src/e-util/e-html-editor-page-dialog.c:545
+#: ../src/e-util/e-html-editor-table-dialog.c:714
 msgid "_Remove image"
 msgstr "_Poista kuva"
 
@@ -14388,7 +14622,7 @@ msgstr "Solun ominaisuudet"
 #: ../src/e-util/e-html-editor-find-dialog.c:92
 #: ../src/e-util/e-html-editor-replace-dialog.c:68
 msgid "No match found"
-msgstr ""
+msgstr "Vastinetta ei löytynyt"
 
 #: ../src/e-util/e-html-editor-find-dialog.c:215
 #: ../src/e-util/e-html-editor-replace-dialog.c:295
@@ -14409,44 +14643,44 @@ msgstr "Et_si"
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:263
+#: ../src/e-util/e-html-editor-hrule-dialog.c:241
 msgid "<b>Size</b>"
 msgstr "<b>Koko</b>"
 
 #. Width
-#: ../src/e-util/e-html-editor-hrule-dialog.c:283
+#: ../src/e-util/e-html-editor-hrule-dialog.c:261
 #: ../src/e-util/e-html-editor-image-dialog.c:538
-#: ../src/e-util/e-html-editor-table-dialog.c:571
+#: ../src/e-util/e-html-editor-table-dialog.c:562
 msgid "_Width:"
 msgstr "_Leveys:"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-hrule-dialog.c:286
 msgid "_Size:"
 msgstr "_Koko:"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:315
+#: ../src/e-util/e-html-editor-hrule-dialog.c:293
 msgid "<b>Style</b>"
 msgstr "<b>Tyyli</b>"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:657
+#: ../src/e-util/e-html-editor-hrule-dialog.c:318
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "_Alignment:"
 msgstr "_Tasaus:"
 
 #. Shaded
-#: ../src/e-util/e-html-editor-hrule-dialog.c:346
+#: ../src/e-util/e-html-editor-hrule-dialog.c:324
 msgid "S_haded"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:363
+#: ../src/e-util/e-html-editor-hrule-dialog.c:341
 #, fuzzy
 #| msgid "Folder Properties"
 msgid "Rule properties"
 msgstr "Kansion ominaisuudet"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:465
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:514
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:65
+#: ../src/e-util/e-html-editor-table-dialog.c:505
 msgid "<b>General</b>"
 msgstr "<b>Yleiset</b>"
 
@@ -14467,7 +14701,7 @@ msgid "_Y-Padding:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-image-dialog.c:635
-#: ../src/e-util/e-html-editor-table-dialog.c:638
+#: ../src/e-util/e-html-editor-table-dialog.c:629
 msgid "_Border:"
 msgstr "_Reunus:"
 
@@ -14476,7 +14710,7 @@ msgid "<b>Link</b>"
 msgstr "<b>Linkki</b>"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:213
+#: ../src/e-util/e-html-editor-link-dialog.c:210
 msgid "_URL:"
 msgstr "_Osoite:"
 
@@ -14488,94 +14722,105 @@ msgstr "_Testaa osoite…"
 msgid "Image Properties"
 msgstr "Kuvan ominaisuudet"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:236
+#: ../src/e-util/e-html-editor-link-dialog.c:233
 msgid "_Remove Link"
 msgstr "_Poista linkki"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:261
+#: ../src/e-util/e-html-editor-link-dialog.c:258
 msgid "Link Properties"
 msgstr "Linkin ominaisuudet"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:68
+#: ../src/e-util/e-html-editor-page-dialog.c:71
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:77
+#: ../src/e-util/e-html-editor-page-dialog.c:80
 msgid "Blue Ink"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:86
+#: ../src/e-util/e-html-editor-page-dialog.c:89
 msgid "Paper"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:95
+#: ../src/e-util/e-html-editor-page-dialog.c:98
 msgid "Ribbon"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:104
+#: ../src/e-util/e-html-editor-page-dialog.c:107
 msgid "Midnight"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:122 ../src/mail/filtertypes.xml.in.h:38
+#: ../src/e-util/e-html-editor-page-dialog.c:125 ../src/mail/filtertypes.xml.in.h:38
 #: ../src/mail/searchtypes.xml.in.h:41 ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:131
+#: ../src/e-util/e-html-editor-page-dialog.c:134
 msgid "Graph Paper"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:379
-msgid "<b>Colors</b>"
-msgstr "<b>Värit</b>"
+#. == Colors ==
+#: ../src/e-util/e-html-editor-page-dialog.c:402
+msgid "Colors"
+msgstr "Värit"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:398
+#: ../src/e-util/e-html-editor-page-dialog.c:422
 msgid "_Text:"
 msgstr "_Teksti:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:413
+#: ../src/e-util/e-html-editor-page-dialog.c:437
 msgid "_Link:"
 msgstr "_Linkki:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:428
+#: ../src/e-util/e-html-editor-page-dialog.c:452
 msgid "_Visited Link:"
 msgstr "_Vierailtu linkki:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:443
+#: ../src/e-util/e-html-editor-page-dialog.c:467
 msgid "_Background:"
 msgstr "_Tausta:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:451
-msgid "<b>Background Image</b>"
-msgstr "<b>Taustakuva</b>"
+#. == Text ==
+#: ../src/e-util/e-html-editor-page-dialog.c:475
+msgid "Text"
+msgstr "Teksti"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/e-util/e-html-editor-page-dialog.c:493
+msgid "_Font Name:"
+msgstr "_Fontin nimi:"
+
+#. == Background Image ==
+#: ../src/e-util/e-html-editor-page-dialog.c:500
+msgid "Background Image"
+msgstr "Taustakuva"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:523
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "_Template:"
 msgstr "_Malli:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:481
+#: ../src/e-util/e-html-editor-page-dialog.c:531
 #: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:488
+#: ../src/e-util/e-html-editor-page-dialog.c:538
 msgid "_Custom:"
 msgstr "_Oma:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:515
+#: ../src/e-util/e-html-editor-page-dialog.c:567
 msgid "Page Properties"
 msgstr "Sivun ominaisuudet"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:82
 msgid "_Style:"
 msgstr "_Tyyli:"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:89
 msgid "<b>Alignment</b>"
 msgstr "<b>Tasaus</b>"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:163
 msgid "Paragraph Properties"
 msgstr "Kappaleen ominaisuudet"
 
@@ -14672,35 +14917,35 @@ msgstr "Lisää sana"
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:536
+#: ../src/e-util/e-html-editor-table-dialog.c:527
 msgid "_Rows:"
 msgstr "_Rivejä:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:553
+#: ../src/e-util/e-html-editor-table-dialog.c:544
 msgid "C_olumns:"
 msgstr "_Sarakkeita:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:604
+#: ../src/e-util/e-html-editor-table-dialog.c:595
 msgid "_Spacing:"
 msgstr "_Välistys:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:621
+#: ../src/e-util/e-html-editor-table-dialog.c:612
 #, fuzzy
 #| msgid "Loading"
 msgid "_Padding:"
 msgstr "Ladataan"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:685
+#: ../src/e-util/e-html-editor-table-dialog.c:676
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2427
+#: ../src/e-util/e-webdav-browser.c:2408
 msgid "_Color:"
 msgstr "_Väri:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:716
+#: ../src/e-util/e-html-editor-table-dialog.c:707
 msgid "Image:"
 msgstr "Kuva:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:743
+#: ../src/e-util/e-html-editor-table-dialog.c:734
 msgid "Table Properties"
 msgstr "Taulukon ominaisuudet"
 
@@ -14820,7 +15065,7 @@ 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
+#: ../src/mail/e-mail-config-provider-page.c:583
 msgid "minutes"
 msgstr "minuutti"
 
@@ -14840,23 +15085,23 @@ msgstr "päivä"
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
+#: ../src/e-util/e-mail-signature-editor.c:321 ../src/mail/e-mail-notes.c:1017
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
+#: ../src/e-util/e-mail-signature-editor.c:326 ../src/mail/e-mail-notes.c:1022
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../src/e-util/e-mail-signature-editor.c:558
+#: ../src/e-util/e-mail-signature-editor.c:568
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../src/e-util/e-mail-signature-editor.c:591
+#: ../src/e-util/e-mail-signature-editor.c:601
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../src/e-util/e-mail-signature-editor.c:627
+#: ../src/e-util/e-mail-signature-editor.c:637
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
@@ -14902,40 +15147,40 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
-#: ../src/e-util/e-misc-utils.c:278
+#: ../src/e-util/e-misc-utils.c:279
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../src/e-util/e-misc-utils.c:362
+#: ../src/e-util/e-misc-utils.c:363
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../src/e-util/e-misc-utils.c:2561
+#: ../src/e-util/e-misc-utils.c:2562
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Avataan kalenteria “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2564
+#: ../src/e-util/e-misc-utils.c:2565
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Avataan muistilappuluetteloa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2567
+#: ../src/e-util/e-misc-utils.c:2568
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Avataan tehtävälistaa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2570
+#: ../src/e-util/e-misc-utils.c:2571
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Avataan osoitekirja “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3350
+#: ../src/e-util/e-misc-utils.c:3351
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
 
-#: ../src/e-util/e-misc-utils.c:4244
+#: ../src/e-util/e-misc-utils.c:3979
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -14943,18 +15188,18 @@ msgstr ""
 "Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
 "kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
 
-#: ../src/e-util/e-misc-utils.c:4256
+#: ../src/e-util/e-misc-utils.c:3991
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "Yhteyskäytännön asettaminen versioon LDAPv3 (%d) epäonnistui: %s"
 
-#: ../src/e-util/e-misc-utils.c:4268
+#: ../src/e-util/e-misc-utils.c:4003
 #, fuzzy, c-format
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
-#: ../src/e-util/e-misc-utils.c:4282
+#: ../src/e-util/e-misc-utils.c:4017
 #, fuzzy, c-format
 #| msgid ""
 #| "This LDAP server may use an older version of LDAP, which does not support this "
@@ -14971,7 +15216,7 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4293
+#: ../src/e-util/e-misc-utils.c:4028
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
 "functionality or it may be misconfigured. Ask your administrator for supported "
@@ -14981,12 +15226,12 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4326
+#: ../src/e-util/e-misc-utils.c:4061
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolutionia ei ole koostettu LDAP-tuen kera"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4640
+#: ../src/e-util/e-misc-utils.c:4384
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14994,12 +15239,38 @@ msgstr "Tuntematon (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4649
+#: ../src/e-util/e-misc-utils.c:4393
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../src/e-util/e-misc-utils.c:4551
+#, c-format
+msgid "Click to call %s"
+msgstr "Soita numeroon %s napsauttamalla"
+
+#: ../src/e-util/e-misc-utils.c:4553
+msgid "Click to hide/unhide addresses"
+msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
+
+#: ../src/e-util/e-misc-utils.c:4566
+#, 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-misc-utils.c:4568
+#, 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-misc-utils.c:4574
+#, c-format
+msgid "Click to open %s"
+msgstr "Napsauta avataksesi %s"
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Näytä yhteystiedot"
@@ -15062,7 +15333,7 @@ msgstr "_Leikkaa %s"
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
 
-#: ../src/e-util/e-name-selector-list.c:585
+#: ../src/e-util/e-name-selector-list.c:587
 #, c-format
 msgid "_Delete %s"
 msgstr "_Poista %s"
@@ -15212,35 +15483,35 @@ msgstr "Muokkaa sääntöä"
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../src/e-util/e-search-bar.c:621
+#: ../src/e-util/e-search-bar.c:624
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../src/e-util/e-search-bar.c:629
+#: ../src/e-util/e-search-bar.c:632
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../src/e-util/e-search-bar.c:641
+#: ../src/e-util/e-search-bar.c:644
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-search-bar.c:671
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-search-bar.c:683
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../src/e-util/e-search-bar.c:689
+#: ../src/e-util/e-search-bar.c:692
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../src/e-util/e-search-bar.c:717
+#: ../src/e-util/e-search-bar.c:720
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../src/e-util/e-search-bar.c:739
+#: ../src/e-util/e-search-bar.c:742
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
@@ -15286,13 +15557,13 @@ msgstr "Lähetysasetukset"
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "S_isällä"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
@@ -15307,13 +15578,13 @@ msgstr "Milloin _sopii"
 msgid "_Delay message delivery"
 msgstr "_Viivästä viestin toimitusta"
 
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_Jälkeen"
 
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
@@ -15323,7 +15594,7 @@ msgstr "päivää"
 msgid "_Set expiration date"
 msgstr "Aseta _eräpäivä"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
 #: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
@@ -15393,67 +15664,63 @@ msgstr ""
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../src/e-util/e-source-config.c:724 ../src/e-util/e-source-config.c:728
+#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/e-util/e-source-config.c:738 ../src/e-util/e-source-config.c:742
+#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1752
+#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1733
 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:1416
+#: ../src/e-util/e-source-config.c:1417
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1520
+#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä"
 
-#: ../src/e-util/e-source-config.c:1547
+#: ../src/e-util/e-source-config.c:1548
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../src/e-util/e-source-config.c:1583
+#: ../src/e-util/e-source-config.c:1584
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../src/e-util/e-source-selector.c:3219
+#: ../src/e-util/e-source-selector.c:3236
 msgid "Show"
 msgstr "Näytä"
 
-#: ../src/e-util/e-source-selector.c:3225
+#: ../src/e-util/e-source-selector.c:3242
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../src/e-util/e-source-selector.c:3380 ../src/mail/e-mail-display.c:805
+#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:717
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../src/e-util/e-source-selector.c:3380 ../src/e-util/e-source-selector.c:3478
+#: ../src/e-util/e-source-selector.c:3397 ../src/e-util/e-source-selector.c:3495
 msgid "_Show"
 msgstr "_Näytä"
 
-#: ../src/e-util/e-source-selector.c:3432
+#: ../src/e-util/e-source-selector.c:3449
 msgid "Manage Groups"
 msgstr "Hallitse ryhmiä"
 
-#: ../src/e-util/e-source-selector.c:3444
+#: ../src/e-util/e-source-selector.c:3461
 msgid "Available Groups:"
 msgstr "Käytettävissä olevat ryhmät:"
 
-#: ../src/e-util/e-source-selector-dialog.c:234
-msgid "_Destination"
-msgstr "_Kohde"
-
-#: ../src/e-util/e-source-selector-dialog.c:362
+#: ../src/e-util/e-source-selector-dialog.c:317
 msgid "Select destination"
 msgstr "Valitse kohde"
 
@@ -15695,11 +15962,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:1782
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1792
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1782
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -15790,60 +16057,61 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../src/e-util/e-table-header-item.c:1609
+#: ../src/e-util/e-table-header-item.c:1610
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../src/e-util/e-table-header-item.c:1632
+#: ../src/e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../src/e-util/e-table-header-item.c:1635
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../src/e-util/e-table-header-item.c:1638
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "_Reset sort"
 msgstr "_Palauta järjestys"
 
-#: ../src/e-util/e-table-header-item.c:1641
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../src/e-util/e-table-header-item.c:1644
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../src/e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn…"
 msgstr "Lisää _sarake…"
 
-#: ../src/e-util/e-table-header-item.c:1655
+#: ../src/e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1671
 msgid "Format Column_s…"
 msgstr "Muotoile _sarakkeet…"
 
-#: ../src/e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1675
+#: ../src/shell/e-shell-window-actions.c:1239
 msgid "Custo_mize Current View…"
 msgstr "_Muokkaa nykyistä näkymää…"
 
-#: ../src/e-util/e-table-header-item.c:1732
+#: ../src/e-util/e-table-header-item.c:1742
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1755
+#: ../src/e-util/e-table-header-item.c:1765
 msgid "_Custom"
 msgstr "_Oma"
 
@@ -15924,224 +16192,198 @@ msgstr "Osoitekirja"
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1553
-#: ../src/mail/em-folder-tree-model.c:1930
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
+#: ../src/mail/em-folder-tree-model.c:1936
 msgid "Loading…"
 msgstr "Ladataan…"
 
-#: ../src/e-util/e-webdav-browser.c:1387
+#: ../src/e-util/e-webdav-browser.c:1368
 msgid "Searching collection children…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1389
+#: ../src/e-util/e-webdav-browser.c:1370
 msgid "Failed to search for collection children"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1423
+#: ../src/e-util/e-webdav-browser.c:1404
 msgid "Searching for user home, please wait…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1425
+#: ../src/e-util/e-webdav-browser.c:1406
 #, fuzzy
 #| msgid "Unable to perform search."
 msgid "Failed to search for user home"
 msgstr "Hakua ei voi suorittaa."
 
-#: ../src/e-util/e-webdav-browser.c:1768
+#: ../src/e-util/e-webdav-browser.c:1749
 msgid "At least one component type should be set"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1787
+#: ../src/e-util/e-webdav-browser.c:1768
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to get selected collection HREF"
 msgstr "Yhteystiedon poisto epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1800
 msgid "Failed to save changes"
 msgstr "Muutoksia ei voitu tallentaa"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1802
 msgid "Creating new book…"
 msgstr "Luodaan uutta kirjaa…"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1803
 msgid "Failed to create new book"
 msgstr "Uuden kirjan luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1824
+#: ../src/e-util/e-webdav-browser.c:1805
 msgid "Creating new calendar…"
 msgstr "Luodaan uutta kalenteria…"
 
-#: ../src/e-util/e-webdav-browser.c:1825
+#: ../src/e-util/e-webdav-browser.c:1806
 msgid "Failed to create new calendar"
 msgstr "Uuden kalenterin luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1827
+#: ../src/e-util/e-webdav-browser.c:1808
 msgid "Creating new collection…"
 msgstr "Luodaan uutta kokoelmaa…"
 
-#: ../src/e-util/e-webdav-browser.c:1828
+#: ../src/e-util/e-webdav-browser.c:1809
 msgid "Failed to create new collection"
 msgstr "Uuden kokoelman luominen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:1967
+#: ../src/e-util/e-webdav-browser.c:1948
 msgid "It is not allowed to create book under another book or calendar"
 msgstr ""
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1969
+#: ../src/e-util/e-webdav-browser.c:1950
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2179
 msgid "Deleting book…"
 msgstr "Poistetaan kirjaa…"
 
-#: ../src/e-util/e-webdav-browser.c:2199
+#: ../src/e-util/e-webdav-browser.c:2180
 msgid "Failed to delete book"
 msgstr "Kirjan poistaminen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2202
+#: ../src/e-util/e-webdav-browser.c:2183
 msgid "Deleting calendar…"
 msgstr "Poistetaan kalenteri…"
 
-#: ../src/e-util/e-webdav-browser.c:2203
+#: ../src/e-util/e-webdav-browser.c:2184
 msgid "Failed to delete calendar"
 msgstr "Kalenterin poisto epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2206
+#: ../src/e-util/e-webdav-browser.c:2187
 msgid "Deleting collection…"
 msgstr "Poistetaan kokoelmaa…"
 
-#: ../src/e-util/e-webdav-browser.c:2207
+#: ../src/e-util/e-webdav-browser.c:2188
 msgid "Failed to delete collection"
 msgstr "Kokoelman poistaminen epäonnistui"
 
-#: ../src/e-util/e-webdav-browser.c:2438
+#: ../src/e-util/e-webdav-browser.c:2419
 msgid "For Components:"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2444
+#: ../src/e-util/e-webdav-browser.c:2425
 msgid "_Events"
 msgstr "_Tapahtumat"
 
-#: ../src/e-util/e-webdav-browser.c:2634
+#: ../src/e-util/e-webdav-browser.c:2615
 msgid "WebDAV server:"
 msgstr "WebDAV-palvelin:"
 
-#: ../src/e-util/e-webdav-browser.c:2669
+#: ../src/e-util/e-webdav-browser.c:2650
 msgid "Create _Book"
 msgstr "Luo ki_rja"
 
-#: ../src/e-util/e-webdav-browser.c:2676
+#: ../src/e-util/e-webdav-browser.c:2657
 msgid "Create _Calendar"
 msgstr "_Luo kalenteri"
 
-#: ../src/e-util/e-webdav-browser.c:2683
+#: ../src/e-util/e-webdav-browser.c:2664
 msgid "Create Collectio_n"
 msgstr "Luo _kokoelma"
 
-#: ../src/e-util/e-web-view.c:406
+#: ../src/e-util/e-web-view.c:407
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/e-util/e-web-view.c:408
+#: ../src/e-util/e-web-view.c:409
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:416
+#: ../src/e-util/e-web-view.c:417
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:418
+#: ../src/e-util/e-web-view.c:419
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:426
+#: ../src/e-util/e-web-view.c:427
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:433
+#: ../src/e-util/e-web-view.c:434
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _raakasähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:435
+#: ../src/e-util/e-web-view.c:436
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopioi raakasähköpostiosoite leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:450
+#: ../src/e-util/e-web-view.c:451
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../src/e-util/e-web-view.c:452
+#: ../src/e-util/e-web-view.c:453
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:457
+#: ../src/e-util/e-web-view.c:458
 msgid "Save _Image…"
 msgstr "Tallenna _kuva…"
 
-#: ../src/e-util/e-web-view.c:459
+#: ../src/e-util/e-web-view.c:460
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
-#: ../src/mail/e-mail-reader.c:2820
+#: ../src/e-util/e-web-view.c:475 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2819
 msgid "Search _Web…"
 msgstr "Etsi _verkosta…"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/e-util/e-web-view.c:477 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2821
 #, fuzzy
 #| msgid "Send a message to the selected contacts"
 msgid "Search the Web with the selected text"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2102
+#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2016
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../src/e-util/e-web-view.c:1451
-#, c-format
-msgid "Click to call %s"
-msgstr "Soita numeroon %s napsauttamalla"
-
-#: ../src/e-util/e-web-view.c:1453
-msgid "Click to hide/unhide addresses"
-msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
-
-#: ../src/e-util/e-web-view.c:1464
-#, fuzzy, c-format
-#| msgid "Enter the recipients of the message"
-msgid "Go to the section %s of the message"
-msgstr "Syötä viestin vastaanottajat"
-
-#: ../src/e-util/e-web-view.c:1466
-#, fuzzy
-#| msgid "Enter the recipients of the message"
-msgid "Go to the beginning of the message"
-msgstr "Syötä viestin vastaanottajat"
-
-#: ../src/e-util/e-web-view.c:1470
-#, c-format
-msgid "Click to open %s"
-msgstr "Napsauta avataksesi %s"
-
-#: ../src/e-util/e-web-view.c:4157
+#: ../src/e-util/e-web-view.c:3742
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:4345
+#: ../src/e-util/e-web-view.c:3930
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/e-util/e-web-view.c:4382
+#: ../src/e-util/e-web-view.c:3967
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../src/e-util/e-web-view.c:4529
+#: ../src/e-util/e-web-view.c:4114
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -16244,7 +16486,7 @@ msgstr "määrittelemäsi aika"
 msgid "a time relative to the current time"
 msgstr "Aika suhteessa tämänhetkiseen aikaan"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:98
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -16371,7 +16613,7 @@ msgstr "Luo uusi _näkymä"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:204
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:202
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
@@ -16379,7 +16621,7 @@ msgstr "Haluatko tallentaa muutokset?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:206
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:204
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
@@ -16418,97 +16660,97 @@ msgstr "Valintaa ei voitu hakea poistettavaksi."
 msgid "Saving message to folder “%s”"
 msgstr "Tallennetaan viesti kansioon “%s”"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:565
+#: ../src/libemail-engine/e-mail-folder-utils.c:567
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:675
-#: ../src/libemail-engine/e-mail-folder-utils.c:937
+#: ../src/libemail-engine/e-mail-folder-utils.c:677
+#: ../src/libemail-engine/e-mail-folder-utils.c:939
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiä"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:777
+#: ../src/libemail-engine/e-mail-folder-utils.c:779
 msgid "Scanning messages for duplicates"
 msgstr "Etsitään kaksoiskappaleita viesteistä"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1150
+#: ../src/libemail-engine/e-mail-folder-utils.c:1152
 #, c-format
 msgid "Removing folder “%s”"
 msgstr "Poistetaan kansiota “%s”"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1331
+#: ../src/libemail-engine/e-mail-folder-utils.c:1333
 #, c-format
 msgid "File “%s” has been removed."
 msgstr "Tiedosto “%s” on poistettu."
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1335
+#: ../src/libemail-engine/e-mail-folder-utils.c:1337
 msgid "File has been removed."
 msgstr "Tiedosto on poistettu."
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1411
+#: ../src/libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "Poistetaan liitteitä"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1583
+#: ../src/libemail-engine/e-mail-folder-utils.c:1585
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1961
+#: ../src/libemail-engine/e-mail-folder-utils.c:1963
 #, fuzzy, c-format
 msgid "Invalid folder URI “%s”"
 msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-properties.c:1444 ../src/mail/em-folder-tree-model.c:1501
+#: ../src/mail/em-folder-properties.c:1444 ../src/mail/em-folder-tree-model.c:1503
 #: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
-#: ../src/modules/mail/e-mail-shell-view-private.c:1043
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-tree-model.c:1495 ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/mail/em-folder-tree-model.c:1497 ../src/mail/importers/kmail-libs.c:144
+#: ../src/modules/mail/e-mail-shell-view-private.c:1009
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1505 ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/mail/em-folder-tree-model.c:1507 ../src/mail/importers/kmail-libs.c:140
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1509 ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1036
+#: ../src/mail/em-folder-tree-model.c:1511 ../src/mail/importers/kmail-libs.c:142
+#: ../src/modules/mail/e-mail-shell-view-private.c:1015
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1499
 #: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1038
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../src/libemail-engine/e-mail-session.c:1519
+#: ../src/libemail-engine/e-mail-session.c:1514
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../src/libemail-engine/e-mail-session.c:1580
+#: ../src/libemail-engine/e-mail-session.c:1575
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been cancelled."
@@ -16516,26 +16758,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:1593
+#: ../src/libemail-engine/e-mail-session.c:1588
 #, 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:1794
+#: ../src/libemail-engine/e-mail-session.c:1789
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1914
+#: ../src/libemail-engine/e-mail-session.c:1909
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1916
+#: ../src/libemail-engine/e-mail-session.c:1911
 msgid "Looking up recipient PGP keys in address books…"
-msgstr ""
+msgstr "Etsitään vastaanottajan PGP-avaimia osoitekirjoissa…"
 
-#: ../src/libemail-engine/e-mail-session.c:2963
+#: ../src/libemail-engine/e-mail-session.c:2958
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for “%s”"
@@ -16548,28 +16790,28 @@ msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:613
-#: ../src/libemail-engine/mail-ops.c:707
+#: ../src/libemail-engine/mail-ops.c:708
 #, 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:650
-#: ../src/libemail-engine/mail-ops.c:743
+#: ../src/libemail-engine/mail-ops.c:744
 #, 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:683
 #: ../src/libemail-engine/e-mail-session-utils.c:718
-#: ../src/libemail-engine/mail-ops.c:771 ../src/libemail-engine/mail-ops.c:806
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
 #, 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:707
-#: ../src/libemail-engine/mail-ops.c:795
+#: ../src/libemail-engine/mail-ops.c:796
 #, fuzzy, c-format
 #| msgid ""
 #| "Failed to append to %s: %s\n"
@@ -16582,14 +16824,14 @@ msgstr ""
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
 #: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:823
+#: ../src/libemail-engine/mail-ops.c:824
 #, 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:929
-#: ../src/libemail-engine/mail-ops.c:1019 ../src/libemail-engine/mail-ops.c:1134
+#: ../src/libemail-engine/e-mail-session-utils.c:930
+#: ../src/libemail-engine/mail-ops.c:1020 ../src/libemail-engine/mail-ops.c:1135
 #: ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
@@ -16604,7 +16846,7 @@ msgstr "Katkaistaan yhteys kohteeseen “%s”"
 msgid "Reconnecting to “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen “%s”"
 
-#: ../src/libemail-engine/e-mail-store-utils.c:349 ../src/mail/mail-send-recv.c:1089
+#: ../src/libemail-engine/e-mail-store-utils.c:349 ../src/mail/mail-send-recv.c:1086
 #, c-format
 msgid "Preparing account “%s” for offline"
 msgstr "Valmistellaan tiliä “%s” yhteydettömään tilaan"
@@ -16627,7 +16869,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "Noudetaan viestejä kohteesta “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:737
+#: ../src/libemail-engine/mail-ops.c:738
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in "
@@ -16636,7 +16878,7 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:1030
+#: ../src/libemail-engine/mail-ops.c:1031
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
@@ -16644,54 +16886,54 @@ 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:1088
+#: ../src/libemail-engine/mail-ops.c:1089
 #, 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:1094
+#: ../src/libemail-engine/mail-ops.c:1095
 msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../src/libemail-engine/mail-ops.c:1096
+#: ../src/libemail-engine/mail-ops.c:1097
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../src/libemail-engine/mail-ops.c:1220
+#: ../src/libemail-engine/mail-ops.c:1221
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Siirretään viestejä kansioon “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1222
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Kopioidaan viestejä kansioon “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1340
+#: ../src/libemail-engine/mail-ops.c:1341
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Tallennetaan kansiota “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1468
+#: ../src/libemail-engine/mail-ops.c:1469
 #, 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:1469
+#: ../src/libemail-engine/mail-ops.c:1470
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Tallennetaan tiliä “%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1544
+#: ../src/libemail-engine/mail-ops.c:1545
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1636
+#: ../src/libemail-engine/mail-ops.c:1644
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Processing folder changes in “%s”"
@@ -16734,7 +16976,7 @@ msgstr "Välitetty viesti"
 msgid "Setting up Search Folder: %s"
 msgstr "Määritellään hakunäkymää: %s"
 
-#: ../src/libemail-engine/mail-vfolder.c:302
+#: ../src/libemail-engine/mail-vfolder.c:303
 #, fuzzy, c-format
 #| msgid "Updating Search Folders for '%s' - %s"
 msgid "Updating Search Folders for “%s : %s”"
@@ -16745,7 +16987,7 @@ msgstr "Päivitetään hakukansioita - '%s' - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../src/libemail-engine/mail-vfolder.c:666
+#: ../src/libemail-engine/mail-vfolder.c:667
 #, fuzzy, c-format
 #| msgid ""
 #| "The Search Folder \"%s\" has been modified to account for the deleted folder\n"
@@ -16795,66 +17037,67 @@ msgstr "_Oletustili"
 msgid "Invalid URI: “%s”"
 msgstr "Virheellinen URI: “%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:756
+#: ../src/mail/e-mail-autoconfig.c:768
 #, c-format
 msgid "Host: %s:%d"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:760
+#: ../src/mail/e-mail-autoconfig.c:772
 #, c-format
 msgid "User: %s"
 msgstr "Käyttäjä: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:764
+#: ../src/mail/e-mail-autoconfig.c:776
 #, c-format
 msgid "Security method: %s"
 msgstr "Salaustapa: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:765 ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:777 ../src/mail/e-mail-config-summary-page.c:146
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:766 ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:778 ../src/mail/e-mail-config-summary-page.c:149
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:770
+#: ../src/mail/e-mail-autoconfig.c:782
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Tunnistautumismekanismi: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:950
+#: ../src/mail/e-mail-autoconfig.c:962
 msgid "No email address provided"
-msgstr "Sähköpostiosoitetta ei annettu."
+msgstr "Sähköpostiosoitetta ei annettu"
 
-#: ../src/mail/e-mail-autoconfig.c:959
+#: ../src/mail/e-mail-autoconfig.c:971
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../src/mail/e-mail-autoconfig.c:1309
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/mail/e-mail-autoconfig.c:1321
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "IMAP server"
 msgstr "IMAP-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1316
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/mail/e-mail-autoconfig.c:1328
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "POP3 server"
 msgstr "POP3-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1323
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/mail/e-mail-autoconfig.c:1335
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
-#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:837
-#: ../src/shell/e-shell-window-actions.c:844
-#: ../src/shell/e-shell-window-actions.c:851
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:877
+#: ../src/shell/e-shell-window-actions.c:884
+#: ../src/shell/e-shell-window-actions.c:891
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-browser.c:314
+#: ../src/mail/e-mail-browser.c:353
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -16944,11 +17187,12 @@ msgid "Language for Reply and Forward attribution text"
 msgstr ""
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4145 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4148 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "Aloita _kirjoittaminen lopusta"
 
-#: ../src/mail/e-mail-config-composing-page.c:531 ../src/mail/mail-config.ui.h:23
+#: ../src/mail/e-mail-config-composing-page.c:531
+#: ../src/mail/em-composer-utils.c:4151 ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä"
 
@@ -17027,45 +17271,43 @@ msgstr "A_rkistointikansio:"
 msgid "Choose a folder to archive messages to."
 msgstr "Valitse kansio johon viesti arkistoidaan."
 
-#: ../src/mail/e-mail-config-defaults-page.c:799
+#: ../src/mail/e-mail-config-defaults-page.c:800
 msgid "_Templates Folder:"
 msgstr "_Mallipohjakansio:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:809
+#: ../src/mail/e-mail-config-defaults-page.c:810
 #, fuzzy
 #| msgid "Choose a folder for deleted messages."
 msgid "Choose a folder to use for template messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../src/mail/e-mail-config-defaults-page.c:831
+#: ../src/mail/e-mail-config-defaults-page.c:832
 msgid "_Restore Defaults"
 msgstr "_Palauta oletukset"
 
-#: ../src/mail/e-mail-config-defaults-page.c:848
+#: ../src/mail/e-mail-config-defaults-page.c:849
 #, fuzzy
 #| msgid "Go to Folder"
 msgid "_Lookup Folders"
 msgstr "Siirry kansioon"
 
-#: ../src/mail/e-mail-config-defaults-page.c:866
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../src/mail/e-mail-config-defaults-page.c:867
+#: ../src/mail/e-mail-config-defaults-page.c:868
 msgid "Choose a folder for deleted messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../src/mail/e-mail-config-defaults-page.c:876
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../src/mail/e-mail-config-defaults-page.c:877
-#, fuzzy
-#| msgid "Choose folders to post the message to."
+#: ../src/mail/e-mail-config-defaults-page.c:878
 msgid "Choose a folder for junk messages."
-msgstr "Valitse kansio johon viesti postitetaan:"
+msgstr "Valitse kansio roskapostiviesteille."
 
-#: ../src/mail/e-mail-config-defaults-page.c:995
+#: ../src/mail/e-mail-config-defaults-page.c:996
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
@@ -17080,7 +17322,7 @@ msgstr ""
 "lähettämiisi sähköpostiviesteihin."
 
 #: ../src/mail/e-mail-config-identity-page.c:580
-#: ../src/mail/e-mail-config-summary-page.c:353
+#: ../src/mail/e-mail-config-summary-page.c:355
 #, fuzzy
 #| msgid ""
 #| "The above name will be used to identify this account.\n"
@@ -17152,7 +17394,7 @@ msgid "Reply To is not a valid email"
 msgstr "Vastausosoite ei ole kelvollinen osoite"
 
 #: ../src/mail/e-mail-config-identity-page.c:970
-#: ../src/mail/e-mail-config-summary-page.c:638
+#: ../src/mail/e-mail-config-summary-page.c:637
 msgid "Account Name cannot be empty"
 msgstr "Tilin nimi ei voi olla tyhjä"
 
@@ -17160,15 +17402,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:538
+#: ../src/mail/e-mail-config-provider-page.c:541
 msgid "Checking for New Mail"
 msgstr "Tarkistetaan uusia viestejä"
 
-#: ../src/mail/e-mail-config-provider-page.c:554
+#: ../src/mail/e-mail-config-provider-page.c:557
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../src/mail/e-mail-config-provider-page.c:764
+#: ../src/mail/e-mail-config-provider-page.c:767
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
@@ -17189,7 +17431,7 @@ msgstr "%s — %s"
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:802
+#: ../src/modules/mail/e-mail-shell-backend.c:806
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Yleiset"
@@ -17265,7 +17507,7 @@ msgstr "Valitse"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:933
+#: ../src/shell/e-shell-window-actions.c:980
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
@@ -17297,54 +17539,54 @@ msgstr "Lähetys"
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
-#: ../src/mail/e-mail-config-summary-page.c:306
+#: ../src/mail/e-mail-config-summary-page.c:308
 msgid "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Alla on yhteenveto asetuksista, joiden avulla otetaan yhteys sähköpostitiliisi."
 
-#: ../src/mail/e-mail-config-summary-page.c:370
+#: ../src/mail/e-mail-config-summary-page.c:372
 msgid "Personal Details"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../src/mail/e-mail-config-summary-page.c:379
+#: ../src/mail/e-mail-config-summary-page.c:381
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../src/mail/e-mail-config-summary-page.c:393
+#: ../src/mail/e-mail-config-summary-page.c:395
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../src/mail/e-mail-config-summary-page.c:407
+#: ../src/mail/e-mail-config-summary-page.c:409
 msgid "Receiving"
 msgstr "Vastaanotto"
 
-#: ../src/mail/e-mail-config-summary-page.c:419
+#: ../src/mail/e-mail-config-summary-page.c:421
 msgid "Sending"
 msgstr "Lähetys"
 
-#: ../src/mail/e-mail-config-summary-page.c:431
+#: ../src/mail/e-mail-config-summary-page.c:433
 msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
-#: ../src/mail/e-mail-config-summary-page.c:452
+#: ../src/mail/e-mail-config-summary-page.c:454
 #: ../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/mail/e-mail-config-summary-page.c:475
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../src/mail/e-mail-config-summary-page.c:494
+#: ../src/mail/e-mail-config-summary-page.c:496
 msgid "Security:"
 msgstr "Salaus:"
 
-#: ../src/mail/e-mail-config-summary-page.c:651
+#: ../src/mail/e-mail-config-summary-page.c:650
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr ""
 
-#: ../src/mail/e-mail-config-summary-page.c:807
+#: ../src/mail/e-mail-config-summary-page.c:806
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
@@ -17367,59 +17609,59 @@ msgstr "Tervetuloa"
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../src/mail/e-mail-display.c:126
+#: ../src/mail/e-mail-display.c:141
 msgid "_Add to Address Book…"
 msgstr "_Lisää osoitekirjaan…"
 
-#: ../src/mail/e-mail-display.c:133
+#: ../src/mail/e-mail-display.c:148
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../src/mail/e-mail-display.c:140
+#: ../src/mail/e-mail-display.c:155
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../src/mail/e-mail-display.c:147
+#: ../src/mail/e-mail-display.c:162
 #, fuzzy
 #| msgid "Send _Reply To..."
 msgid "Send _Reply To…"
 msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:164
 msgid "Send a reply message to this address"
 msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../src/mail/e-mail-display.c:156
+#: ../src/mail/e-mail-display.c:171
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
-#: ../src/mail/e-mail-display.c:812
+#: ../src/mail/e-mail-display.c:724
 msgid "Hid_e All"
 msgstr "_Piilota kaikki"
 
-#: ../src/mail/e-mail-display.c:819
+#: ../src/mail/e-mail-display.c:731
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:738
 msgid "Vie_w All Inline"
 msgstr "_Näytä kaikki sisäkkäisesti"
 
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:745
 msgid "_Zoom to 100%"
 msgstr "_Zoomaa kokoon 100 %"
 
-#: ../src/mail/e-mail-display.c:835
+#: ../src/mail/e-mail-display.c:747
 msgid "Zoom the image to its natural size"
 msgstr "Palauta kuva alkuperäiseen kokoon"
 
-#: ../src/mail/e-mail-display.c:840
+#: ../src/mail/e-mail-display.c:752
 #, fuzzy
 #| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-display.c:842
+#: ../src/mail/e-mail-display.c:754
 msgid "Zoom large images to not be wider than the window width"
 msgstr ""
 
@@ -17545,7 +17787,7 @@ msgstr "Te_htävää"
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
 #: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Lisää merkintä"
@@ -17566,29 +17808,35 @@ msgstr ""
 msgid "Color"
 msgstr "Väri"
 
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:740
+#: ../src/mail/e-mail-notes.c:322 ../src/mail/e-mail-notes.c:725
 #, fuzzy
 #| msgid "Messages"
 msgid "Message Note"
 msgstr "Viestit"
 
-#: ../src/mail/e-mail-notes.c:660
+#: ../src/mail/e-mail-notes.c:645
 #, 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:863
+#: ../src/mail/e-mail-notes.c:870
+#, fuzzy
+#| msgid "Failed to remove attachments from messages."
+msgid "Failed to convert text to message"
+msgstr "Liitteiden poisto viesteistä epäonnistui."
+
+#: ../src/mail/e-mail-notes.c:884 ../src/mail/e-mail-notes.c:909
 msgid "Storing changes…"
 msgstr "Tallennetaan muutoksia…"
 
-#: ../src/mail/e-mail-notes.c:1001
+#: ../src/mail/e-mail-notes.c:1052
 #, fuzzy
 #| msgid "_Edit Message"
 msgid "Edit Message Note"
 msgstr "_Muokkaa viestiä"
 
-#: ../src/mail/e-mail-notes.c:1157
+#: ../src/mail/e-mail-notes.c:1207
 msgid "Retrieving message…"
 msgstr "Noudetaan viestiä…"
 
@@ -17628,7 +17876,7 @@ msgstr "Otsakkeen nimi"
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:135
 msgid "Headers"
 msgstr "Otsakkeet"
 
@@ -17637,721 +17885,721 @@ msgstr "Otsakkeet"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../src/mail/e-mail-reader.c:610
+#: ../src/mail/e-mail-reader.c:609
 #, fuzzy
 #| msgid "Deleting message note..."
 msgid "Deleting message note…"
 msgstr "Poistetaan viestin huomautus..."
 
-#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
-#: ../src/mail/e-mail-reader.c:1941
+#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
+#: ../src/mail/e-mail-reader.c:1940
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../src/mail/e-mail-reader.c:1947
+#: ../src/mail/e-mail-reader.c:1946
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../src/mail/e-mail-reader.c:2151
+#: ../src/mail/e-mail-reader.c:2150
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
+#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä “%s”"
 
-#: ../src/mail/e-mail-reader.c:2398
+#: ../src/mail/e-mail-reader.c:2397
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2400
+#: ../src/mail/e-mail-reader.c:2399
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2405
+#: ../src/mail/e-mail-reader.c:2404
 msgid "_Archive…"
 msgstr "_Arkistoi…"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2406
 #, 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:2412
+#: ../src/mail/e-mail-reader.c:2411
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2413
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2419
+#: ../src/mail/e-mail-reader.c:2418
 msgid "Assign C_olor…"
 msgstr "Aseta _väri…"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2420
 #, 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:2426
+#: ../src/mail/e-mail-reader.c:2425
 #, fuzzy
 #| msgid "Unset Color"
 msgid "Unse_t Color"
 msgstr "Poista värin asetus"
 
-#: ../src/mail/e-mail-reader.c:2428
+#: ../src/mail/e-mail-reader.c:2427
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Unset color for the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2433
+#: ../src/mail/e-mail-reader.c:2432
 msgid "_Copy to Folder…"
 msgstr "K_opioi kansioon…"
 
-#: ../src/mail/e-mail-reader.c:2435
+#: ../src/mail/e-mail-reader.c:2434
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2440
+#: ../src/mail/e-mail-reader.c:2439
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../src/mail/e-mail-reader.c:2442
+#: ../src/mail/e-mail-reader.c:2441
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../src/mail/e-mail-reader.c:2447
+#: ../src/mail/e-mail-reader.c:2446
 #, fuzzy
 #| msgid "_Add note..."
 msgid "_Add note…"
 msgstr "_Lisää huomautus..."
 
-#: ../src/mail/e-mail-reader.c:2449
+#: ../src/mail/e-mail-reader.c:2448
 #, 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:2454
+#: ../src/mail/e-mail-reader.c:2453
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../src/mail/e-mail-reader.c:2456
+#: ../src/mail/e-mail-reader.c:2455
 #, 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:2461
+#: ../src/mail/e-mail-reader.c:2460
 #, fuzzy
 #| msgid "_Edit note..."
 msgid "_Edit note…"
 msgstr "_Muokkaa huomautusta..."
 
-#: ../src/mail/e-mail-reader.c:2463
+#: ../src/mail/e-mail-reader.c:2462
 #, 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:2468
+#: ../src/mail/e-mail-reader.c:2467
 #, fuzzy
 #| msgid "Create a Filter Rule for Mailing _List..."
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2470
+#: ../src/mail/e-mail-reader.c:2469
 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:2475
+#: ../src/mail/e-mail-reader.c:2474
 #, fuzzy
 #| msgid "Create a Filter Rule for _Recipients..."
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2477
+#: ../src/mail/e-mail-reader.c:2476
 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:2482
+#: ../src/mail/e-mail-reader.c:2481
 #, fuzzy
 #| msgid "Create a Filter Rule for Se_nder..."
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2484
+#: ../src/mail/e-mail-reader.c:2483
 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:2489
+#: ../src/mail/e-mail-reader.c:2488
 #, fuzzy
 #| msgid "Create a Filter Rule for _Subject..."
 msgid "Create a Filter Rule for _Subject…"
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2491
+#: ../src/mail/e-mail-reader.c:2490
 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:2496
+#: ../src/mail/e-mail-reader.c:2495
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2497
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../src/mail/e-mail-reader.c:2503
+#: ../src/mail/e-mail-reader.c:2502
 msgid "_Find in Message…"
 msgstr "_Etsi viestistä…"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2504
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/e-mail-reader.c:2510
+#: ../src/mail/e-mail-reader.c:2509
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2511
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../src/mail/e-mail-reader.c:2517
+#: ../src/mail/e-mail-reader.c:2516
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2519
+#: ../src/mail/e-mail-reader.c:2518
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2524
+#: ../src/mail/e-mail-reader.c:2523
 #, fuzzy
 #| msgid "Follow Up"
 msgid "Follow _Up…"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2525
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../src/mail/e-mail-reader.c:2531
+#: ../src/mail/e-mail-reader.c:2530
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
 #: ../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:2538
+#: ../src/mail/e-mail-reader.c:2537
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2544
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
+#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
 #: ../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:2552
+#: ../src/mail/e-mail-reader.c:2551
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2558
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
+#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
 #: ../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:2566
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2572
 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:2582
+#: ../src/mail/e-mail-reader.c:2581
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../src/mail/e-mail-reader.c:2589
+#: ../src/mail/e-mail-reader.c:2588
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2590
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
+#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2597
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2603 ../src/mail/e-mail-reader.c:3019
+#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../src/mail/e-mail-reader.c:2605
+#: ../src/mail/e-mail-reader.c:2604
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2610
+#: ../src/mail/e-mail-reader.c:2609
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../src/mail/e-mail-reader.c:2612
+#: ../src/mail/e-mail-reader.c:2611
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../src/mail/e-mail-reader.c:2617
+#: ../src/mail/e-mail-reader.c:2616
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2618
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2624
+#: ../src/mail/e-mail-reader.c:2623
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2625
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2631
+#: ../src/mail/e-mail-reader.c:2630
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2632
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
+#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/mail/e-mail-reader.c:2640
+#: ../src/mail/e-mail-reader.c:2639
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2645 ../src/mail/e-mail-reader.c:3043
+#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2646
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2652
+#: ../src/mail/e-mail-reader.c:2651
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../src/mail/e-mail-reader.c:2654
+#: ../src/mail/e-mail-reader.c:2653
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../src/mail/e-mail-reader.c:2659
+#: ../src/mail/e-mail-reader.c:2658
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2660
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../src/mail/e-mail-reader.c:2666
+#: ../src/mail/e-mail-reader.c:2665
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message…"
 msgstr "_Muokkaa uutena viestinä…"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2667
 #: ../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:2673
+#: ../src/mail/e-mail-reader.c:2672
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2674
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../src/mail/e-mail-reader.c:2680
+#: ../src/mail/e-mail-reader.c:2679
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2681
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2687
+#: ../src/mail/e-mail-reader.c:2686
 msgid "_Move to Folder…"
 msgstr "_Siirrä kansioon…"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2688
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2694
+#: ../src/mail/e-mail-reader.c:2693
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2695
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2701
+#: ../src/mail/e-mail-reader.c:2700
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2702
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2708
+#: ../src/mail/e-mail-reader.c:2707
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2709
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../src/mail/e-mail-reader.c:2715
+#: ../src/mail/e-mail-reader.c:2714
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2717
+#: ../src/mail/e-mail-reader.c:2716
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2722
+#: ../src/mail/e-mail-reader.c:2721
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2724
+#: ../src/mail/e-mail-reader.c:2723
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2729
+#: ../src/mail/e-mail-reader.c:2728
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2730
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2736
+#: ../src/mail/e-mail-reader.c:2735
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2738
+#: ../src/mail/e-mail-reader.c:2737
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2743
+#: ../src/mail/e-mail-reader.c:2742
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2744
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2752
+#: ../src/mail/e-mail-reader.c:2751
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../src/mail/e-mail-reader.c:2759
+#: ../src/mail/e-mail-reader.c:2758
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../src/mail/e-mail-reader.c:2764
+#: ../src/mail/e-mail-reader.c:2763
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../src/mail/e-mail-reader.c:2766
+#: ../src/mail/e-mail-reader.c:2765
 #: ../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:2771
+#: ../src/mail/e-mail-reader.c:2770
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../src/mail/e-mail-reader.c:2773
+#: ../src/mail/e-mail-reader.c:2772
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../src/mail/e-mail-reader.c:2778
+#: ../src/mail/e-mail-reader.c:2777
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../src/mail/e-mail-reader.c:2780
+#: ../src/mail/e-mail-reader.c:2779
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4099
+#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4102
 #: ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../src/mail/e-mail-reader.c:2787
+#: ../src/mail/e-mail-reader.c:2786
 #: ../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:2792
+#: ../src/mail/e-mail-reader.c:2791
 msgid "Al_ternative Reply…"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2793
 #, 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:2799 ../src/mail/em-composer-utils.c:4094
+#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4097
 #: ../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:2801
+#: ../src/mail/e-mail-reader.c:2800
 #: ../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:2806
+#: ../src/mail/e-mail-reader.c:2805
 #: ../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:2808
+#: ../src/mail/e-mail-reader.c:2807
 #: ../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:2813
+#: ../src/mail/e-mail-reader.c:2812
 msgid "_Save as mbox…"
 msgstr "_Tallenna mbox-muodossa…"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2814
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../src/mail/e-mail-reader.c:2827
+#: ../src/mail/e-mail-reader.c:2826
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2828
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2841
+#: ../src/mail/e-mail-reader.c:2840
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../src/mail/e-mail-reader.c:2843
+#: ../src/mail/e-mail-reader.c:2842
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2848
+#: ../src/mail/e-mail-reader.c:2847
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/mail/e-mail-reader.c:2850
+#: ../src/mail/e-mail-reader.c:2849
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../src/mail/e-mail-reader.c:2855
+#: ../src/mail/e-mail-reader.c:2854
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../src/mail/e-mail-reader.c:2857
+#: ../src/mail/e-mail-reader.c:2856
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2864
+#: ../src/mail/e-mail-reader.c:2863
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2871
+#: ../src/mail/e-mail-reader.c:2870
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../src/mail/e-mail-reader.c:2878
+#: ../src/mail/e-mail-reader.c:2877
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../src/mail/e-mail-reader.c:2885
+#: ../src/mail/e-mail-reader.c:2884
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../src/mail/e-mail-reader.c:2892
+#: ../src/mail/e-mail-reader.c:2891
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../src/mail/e-mail-reader.c:2899
+#: ../src/mail/e-mail-reader.c:2898
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2905
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2912
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2919
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2926
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../src/mail/e-mail-reader.c:2937
+#: ../src/mail/e-mail-reader.c:2936
 #, fuzzy
 #| msgid "Create a Search Folder from Mailing _List..."
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../src/mail/e-mail-reader.c:2939
+#: ../src/mail/e-mail-reader.c:2938
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../src/mail/e-mail-reader.c:2944
+#: ../src/mail/e-mail-reader.c:2943
 #, fuzzy
 #| msgid "Create a Search Folder from Recipien_ts..."
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../src/mail/e-mail-reader.c:2946
+#: ../src/mail/e-mail-reader.c:2945
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../src/mail/e-mail-reader.c:2951
+#: ../src/mail/e-mail-reader.c:2950
 #, fuzzy
 #| msgid "Create a Search Folder from Sen_der..."
 msgid "Create a Search Folder from Sen_der…"
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../src/mail/e-mail-reader.c:2953
+#: ../src/mail/e-mail-reader.c:2952
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../src/mail/e-mail-reader.c:2958
+#: ../src/mail/e-mail-reader.c:2957
 #, fuzzy
 #| msgid "Create a Search Folder from S_ubject..."
 msgid "Create a Search Folder from S_ubject…"
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../src/mail/e-mail-reader.c:2960
+#: ../src/mail/e-mail-reader.c:2959
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../src/mail/e-mail-reader.c:3007
+#: ../src/mail/e-mail-reader.c:3006
 #, fuzzy
 #| msgid "Mark for Follo_w Up..."
 msgid "Mark for Follo_w Up…"
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../src/mail/e-mail-reader.c:3023
+#: ../src/mail/e-mail-reader.c:3022
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../src/mail/e-mail-reader.c:3027
+#: ../src/mail/e-mail-reader.c:3026
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:3031
+#: ../src/mail/e-mail-reader.c:3030
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:3035
+#: ../src/mail/e-mail-reader.c:3034
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/mail/e-mail-reader.c:3047
+#: ../src/mail/e-mail-reader.c:3046
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../src/mail/e-mail-reader.c:3051
+#: ../src/mail/e-mail-reader.c:3050
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/mail/e-mail-reader.c:3099
+#: ../src/mail/e-mail-reader.c:3098
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../src/mail/e-mail-reader.c:3101
+#: ../src/mail/e-mail-reader.c:3100
 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:3107
+#: ../src/mail/e-mail-reader.c:3106
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../src/mail/e-mail-reader.c:3109
+#: ../src/mail/e-mail-reader.c:3108
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../src/mail/e-mail-reader.c:3680
+#: ../src/mail/e-mail-reader.c:3692
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../src/mail/e-mail-reader.c:5041
+#: ../src/mail/e-mail-reader.c:5062
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../src/mail/e-mail-reader.c:5042
+#: ../src/mail/e-mail-reader.c:5063
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
@@ -18360,55 +18608,32 @@ 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:5061
+#: ../src/mail/e-mail-reader.c:5082
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:5062
+#: ../src/mail/e-mail-reader.c:5083
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:5128 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/mail/e-mail-reader.c:5140
+#: ../src/mail/e-mail-reader.c:5161
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/mail/e-mail-reader.c:5144
+#: ../src/mail/e-mail-reader.c:5165
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../src/mail/e-mail-reader.c:6308
-#, c-format
-msgid "Allow remote content for anyone from %s"
-msgstr ""
-
-#: ../src/mail/e-mail-reader.c:6310
-#, c-format
-msgid "Allow remote content for %s"
-msgstr ""
-
-#: ../src/mail/e-mail-reader.c:6327
-#, c-format
-msgid "Allow remote content from %s"
-msgstr "Salli etäsisältö lähettäjältä %s"
-
-#: ../src/mail/e-mail-reader.c:6344
-msgid "Do not show this message again"
-msgstr "Älä näytä tätä viestiä uudestaan"
-
-#: ../src/mail/e-mail-reader.c:6396
-msgid "Load remote content"
-msgstr "Lataa etäsisältö"
-
 #: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
@@ -18464,7 +18689,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 
-#: ../src/mail/e-mail-reader-utils.c:2925
+#: ../src/mail/e-mail-reader-utils.c:3023
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -18475,16 +18700,47 @@ 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:2946
+#: ../src/mail/e-mail-reader-utils.c:3044
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../src/mail/e-mail-reader-utils.c:3360
+#: ../src/mail/e-mail-reader-utils.c:3458
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
+#: ../src/mail/e-mail-remote-content-popover.c:232
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../src/mail/e-mail-remote-content-popover.c:234
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../src/mail/e-mail-remote-content-popover.c:251
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "Salli etäsisältö lähettäjältä %s"
+
+#: ../src/mail/e-mail-remote-content-popover.c:268
+msgid "Do not show this message again"
+msgstr "Älä näytä tätä viestiä uudestaan"
+
+#: ../src/mail/e-mail-remote-content-popover.c:320
+msgid "Load remote content"
+msgstr "Lataa etäsisältö"
+
+#: ../src/mail/e-mail-remote-content-popover.c:395
+msgid ""
+"You can download remote content manually, or set to remember to download remote "
+"content for this sender or used sites."
+msgstr ""
+"Voit ladata etäsisällön itse, tai asettaa etäsisällön latautumisen automaattiseksi "
+"tämän lähettäjän tai sivustoston perusteella."
+
 #: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
@@ -18541,16 +18797,14 @@ msgstr[1] ""
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
 #: ../src/mail/em-composer-utils.c:829
-#, fuzzy
-#| msgid "Waiting for attachments to load..."
 msgid "Waiting for attachments to load…"
-msgstr "Odotetaan liitteiden latautumista..."
+msgstr "Odotetaan liitteiden latautumista…"
 
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:2027
+#: ../src/mail/em-composer-utils.c:2032
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18558,84 +18812,84 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../src/mail/em-composer-utils.c:2033
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../src/mail/em-composer-utils.c:2038
+#: ../src/mail/em-composer-utils.c:2043
 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:2799
+#: ../src/mail/em-composer-utils.c:2804
 #, fuzzy, c-format
 #| msgid "URL: %s"
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "URL: %s"
 
-#: ../src/mail/em-composer-utils.c:3417
+#: ../src/mail/em-composer-utils.c:3422
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../src/mail/em-composer-utils.c:4045
+#: ../src/mail/em-composer-utils.c:4048
 msgid "Alternative Reply"
 msgstr ""
 
-#: ../src/mail/em-composer-utils.c:4048
+#: ../src/mail/em-composer-utils.c:4051
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/mail/em-composer-utils.c:4061
+#: ../src/mail/em-composer-utils.c:4064
 msgid "Recipients:"
 msgstr "Vastaanottajat:"
 
-#: ../src/mail/em-composer-utils.c:4089
+#: ../src/mail/em-composer-utils.c:4092
 msgid "Reply to _Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../src/mail/em-composer-utils.c:4111
+#: ../src/mail/em-composer-utils.c:4114
 msgid "Reply style:"
 msgstr "Vastaustyyli:"
 
-#: ../src/mail/em-composer-utils.c:4119
+#: ../src/mail/em-composer-utils.c:4122
 msgid "_Default"
 msgstr "Oletu_s"
 
-#: ../src/mail/em-composer-utils.c:4123
+#: ../src/mail/em-composer-utils.c:4126
 msgid "Attach_ment"
 msgstr "Liit_e"
 
-#: ../src/mail/em-composer-utils.c:4127
+#: ../src/mail/em-composer-utils.c:4130
 msgid "Inline (_Outlook style)"
 msgstr "Sisennetty (_Outlookin tapaan)"
 
-#: ../src/mail/em-composer-utils.c:4131
+#: ../src/mail/em-composer-utils.c:4134
 msgid "_Quote"
 msgstr "_Lainaa"
 
-#: ../src/mail/em-composer-utils.c:4135
+#: ../src/mail/em-composer-utils.c:4138
 msgid "Do _Not Quote"
 msgstr "_Älä lainaa"
 
-#: ../src/mail/em-composer-utils.c:4142
+#: ../src/mail/em-composer-utils.c:4145
 msgid "_Format message in HTML"
 msgstr "Muotoile viesti _HTML:nä"
 
-#: ../src/mail/em-composer-utils.c:4152
+#: ../src/mail/em-composer-utils.c:4158
 #, fuzzy
 #| msgid "_Template:"
 msgid "Apply t_emplate"
 msgstr "_Malli:"
 
-#: ../src/mail/em-composer-utils.c:4164
+#: ../src/mail/em-composer-utils.c:4170
 #, fuzzy
 #| msgid "Original message"
 msgid "Preserve original message S_ubject"
 msgstr "Alkuperäinen viesti"
 
-#: ../src/mail/em-composer-utils.c:4230
+#: ../src/mail/em-composer-utils.c:4236
 #, fuzzy, c-format
 #| msgid "Sender or Recipients"
 msgid "one recipient"
@@ -18644,11 +18898,11 @@ msgstr[0] "Lähettäjä tai vastaanottajat"
 msgstr[1] "Lähettäjä tai vastaanottajat"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4639
+#: ../src/mail/em-composer-utils.c:4669
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../src/mail/em-composer-utils.c:4644
+#: ../src/mail/em-composer-utils.c:4674
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -18692,7 +18946,7 @@ msgid "If any of the following conditions are met"
 msgstr "mitä tahansa seuraavista ehdoista"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1068
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
 msgid "Then"
 msgstr "sitten"
 
@@ -18705,36 +18959,33 @@ msgid "Select Folder"
 msgstr "Valitse kansio"
 
 #. Translators: This is in a Mail filter rule editor, part of "For account: [ Any   ]" section
-#: ../src/mail/em-filter-rule.c:941
+#: ../src/mail/em-filter-rule.c:940
 #, fuzzy
 #| msgid "A_ngry"
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "_Vihainen"
 
-#: ../src/mail/em-filter-rule.c:1038
+#: ../src/mail/em-filter-rule.c:1037
 msgid "Rul_e type:"
 msgstr "Säänn_ön tyyppi:"
 
-#: ../src/mail/em-filter-rule.c:1056
+#: ../src/mail/em-filter-rule.c:1055
 msgid "_For Account:"
 msgstr "_Tili:"
 
-#: ../src/mail/em-filter-rule.c:1141
+#: ../src/mail/em-filter-rule.c:1140
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
 #: ../src/mail/em-folder-properties.c:170
-#, fuzzy
-#| msgid "Select destination"
 msgid "Select Custom Icon"
-msgstr "Valitse kohde"
+msgstr "Valitse omavalintainen kuvake"
 
 #: ../src/mail/em-folder-properties.c:219
-#, fuzzy
 #| msgid "Use custom fonts"
 msgid "_Use custom icon"
-msgstr "Käytä omia fontteja"
+msgstr "_Käytä omavalintaista kuivaketta"
 
 #: ../src/mail/em-folder-properties.c:312
 #, fuzzy
@@ -18851,7 +19102,7 @@ msgstr "Ulkoasu"
 msgid "Archive"
 msgstr "_Arkistoi..."
 
-#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:126
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
@@ -18864,15 +19115,15 @@ msgstr "Kansion ominaisuudet"
 msgid "Gathering folder properties"
 msgstr "Kerätään kansion ominaisuuksia"
 
-#: ../src/mail/em-folder-selection-button.c:77
+#: ../src/mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
-#: ../src/mail/em-folder-selector.c:399
+#: ../src/mail/em-folder-selector.c:422
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
-#: ../src/mail/em-folder-tree.c:685
+#: ../src/mail/em-folder-tree.c:684
 msgid "Folder names cannot contain “/”"
 msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 
@@ -18894,37 +19145,37 @@ msgstr "Kansion nimi ei voi sisältää merkkiä “/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:879
+#: ../src/mail/em-folder-tree.c:878
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1741
+#: ../src/mail/em-folder-tree.c:1740
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../src/mail/em-folder-tree.c:2290
+#: ../src/mail/em-folder-tree.c:2289
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2293
+#: ../src/mail/em-folder-tree.c:2292
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2629
+#: ../src/mail/em-folder-tree.c:2299 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2631
+#: ../src/mail/em-folder-tree.c:2303 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2322
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
@@ -18990,9 +19241,9 @@ msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
 #: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:933
-#: ../src/modules/mail/e-mail-shell-view-private.c:965
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/modules/mail/e-mail-shell-view-private.c:912
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -19000,7 +19251,7 @@ msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
+#: ../src/modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -19292,7 +19543,7 @@ msgstr "Tärkeä"
 msgid "Read"
 msgstr "Luettu"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:142
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Roskaposti"
@@ -19504,7 +19755,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
 #: ../src/mail/importers/kmail-libs.c:149
-#: ../src/modules/mail/e-mail-shell-view-private.c:1040
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -19781,7 +20032,7 @@ msgstr ""
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
-#. Translators:
+#. Translators: 'changes' is a verb. This is whether to show a warning or not in that situation
 #: ../src/mail/mail-config.ui.h:61
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr ""
@@ -19874,190 +20125,195 @@ msgid "Fix_ed Width Font:"
 msgstr "_Tasalevyinen fontti:"
 
 #: ../src/mail/mail-config.ui.h:94
+msgid "Minimum Font _Size:"
+msgstr "Fontin vähimmäis_koko:"
+
+#. Translators: This is part of 'Minimum Font Size: [ spin button ] (in pixels)'
+#: ../src/mail/mail-config.ui.h:96
+msgid "(in pixels)"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:97
 msgid "_Mark messages as read after"
 msgstr "Merkitse vie_stit luetuiksi viiveellä"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:99
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
-#: ../src/mail/mail-config.ui.h:97
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/mail/mail-config.ui.h:100
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:101
 msgid "color"
 msgstr "väri"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:102
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:103
 msgid "Apply the same _view settings to all folders"
 msgstr "Käytä samoja _näkymäasetuksia kaikille kansioille"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:104
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:105
 msgid "Delete Mail"
 msgstr "Sähköpostien poistaminen"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:106
 msgid "Empty _trash folders"
 msgstr "Tyhj_ennä roskakorikansiot"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:107
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../src/mail/mail-config.ui.h:105
-#, fuzzy
-#| msgid "Confirm _when expunging a folder"
+#: ../src/mail/mail-config.ui.h:108
 msgid "Confirm when emptying a _Junk folder"
-msgstr "_Varmista viestien lopullinen siivous kansiosta"
+msgstr "_Varmista roskapostikansiota tyhjennettäessä"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:109
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the previ_ous message after message deletion"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:110
 msgid "Archive Mail"
 msgstr "Arkistoi viestit"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:111
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:112
 msgid "On This Computer A_rchive folder:"
 msgstr "Arkistointikansio t_ällä tietokoneella:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Show animated images"
 msgstr "N_äytä animoidut kuvat"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:115
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:116
 msgid "Loading Remote Content"
 msgstr "Etäsisällön lataaminen"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:117
 msgid "_Never load remote content from the Internet"
 msgstr "_Älä koskaan lataa etäsisältöä verkosta"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:118
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Lataa viestin etäsisältö vain yhteystietojen lähettämissä viesteissä"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:119
 msgid "_Always load remote content from the Internet"
 msgstr "Lataa _aina etäsisältö verkosta"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:120
 msgid "Notify about _missing remote content in the message preview"
 msgstr "_Huomauta puuttuvasta etäsisällöstä viestien esikatselussa"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:121
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:122
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:123
 msgid "Allow for sites:"
 msgstr "Salli sivustoille:"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:124
 msgid "Allow for senders:"
 msgstr "Salli lähettäjille:"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:125
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:127
 msgid "Sender Photograph"
 msgstr "Lähettäjän valokuva"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:128
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
-#: ../src/mail/mail-config.ui.h:126
-msgid "Search gra_vatar.com for the photograph of sender"
-msgstr "Etsi lähettäjän kuvaa _gravatar.comista"
+#: ../src/mail/mail-config.ui.h:129
+msgid "Search libra_vatar.org for the photograph of sender"
+msgstr "Etsi lähettäjän kuvaa _libra_vatar.orgista"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:130
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../src/mail/mail-config.ui.h:128
-#, fuzzy
-#| msgid "Show deleted messages in the message-list"
+#: ../src/mail/mail-config.ui.h:131
 msgid "Show _full mail addresses in message preview"
-msgstr "Näytä poistetut viestit viestiluettelossa"
+msgstr "Näytä viestin esikatselussa kokonaiset sähköpostiosoitteet"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:132
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:133
 msgid "Re_set"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:134
 #: ../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:133
+#: ../src/mail/mail-config.ui.h:136
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:137
 msgid "_Delete junk messages"
 msgstr "Poista roskapostivi_estit"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:138
 msgid "Junk Test Options"
 msgstr "Roskapostitestaus"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:139
 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:137
+#: ../src/mail/mail-config.ui.h:140
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../src/mail/mail-config.ui.h:138
+#: ../src/mail/mail-config.ui.h:141
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../src/mail/mail-config.ui.h:140
+#: ../src/mail/mail-config.ui.h:143
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../src/mail/mail-config.ui.h:141
+#: ../src/mail/mail-config.ui.h:144
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../src/mail/mail-config.ui.h:142
+#: ../src/mail/mail-config.ui.h:145
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -20134,18 +20390,6 @@ msgstr "_Hyväksy lisenssi"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../src/mail/mail-dialogs.ui.h:22
-msgid "Security Information"
-msgstr "Turvatiedot"
-
-#: ../src/mail/mail-dialogs.ui.h:24
-msgid "Digital Signature"
-msgstr "Digitaalinen allekirjoitus"
-
-#: ../src/mail/mail-dialogs.ui.h:25
-msgid "Encryption"
-msgstr "Salaus"
-
 #: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
@@ -20884,10 +21128,8 @@ msgstr "Kaksoiskappaleita ei löytynyt."
 
 #. Translators: {0} is replaced with a folder name
 #: ../src/mail/mail.error.xml.h:169
-#, fuzzy
-#| msgid "Folder '{0}' doesn't contain any duplicate message."
 msgid "Folder “{0}” doesn’t contain any duplicate message."
-msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
+msgstr "Kansio “{0}” ei sisällä viestien kaksoiskappaleita."
 
 #: ../src/mail/mail.error.xml.h:170
 msgid "Failed to connect account “{0}”."
@@ -21014,80 +21256,68 @@ msgstr "Tapaaminen löytyi kalenterista \"%s\""
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:196
-msgid "Remote content download had been blocked for this message."
-msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
-
-#: ../src/mail/mail.error.xml.h:197
-msgid ""
-"You can download remote content manually, or set to remember to download remote "
-"content for this sender or used sites."
-msgstr ""
-"Voit ladata etäsisällön itse, tai asettaa etäsisällön latautumisen automaattiseksi "
-"tämän lähettäjän tai sivustoston perusteella."
-
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:199
+#: ../src/mail/mail.error.xml.h:197
 #, fuzzy
 #| msgid " (Completed "
 msgid "{0}, Completed on {1}"
 msgstr " (Valmis "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:201
+#: ../src/mail/mail.error.xml.h:199
 msgid "{0} by {1}"
 msgstr ""
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:203
+#: ../src/mail/mail.error.xml.h:201
 msgid "Overdue: {0} by {1}"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:203
 #, fuzzy
 #| msgid "This signature has been changed, but has not been saved."
 msgid "This message note has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:208
+#: ../src/mail/mail.error.xml.h:206
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:208
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:209
 #, fuzzy
 #| msgid "Search for text in the body of the displayed message"
 msgid "Something has gone wrong when displaying the message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/mail.error.xml.h:212
+#: ../src/mail/mail.error.xml.h:210
 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 GNOME Gitlab."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:213
+#: ../src/mail/mail.error.xml.h:211
 msgid "Something has gone wrong when displaying the signature"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:214
+#: ../src/mail/mail.error.xml.h:212
 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 GNOME Gitlab."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:215
+#: ../src/mail/mail.error.xml.h:213
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to permanently remove all the deleted messages in all "
@@ -21095,19 +21325,17 @@ msgstr ""
 msgid "Are you sure you want to delete all the messages in the Junk folder?"
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../src/mail/mail.error.xml.h:216
+#: ../src/mail/mail.error.xml.h:214
 msgid ""
 "These messages will be shown in the Trash folder, where they can be permanently "
 "deleted later."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:217
-#, fuzzy
-#| msgid "_Not Junk"
+#: ../src/mail/mail.error.xml.h:215
 msgid "_Empty Junk"
-msgstr "_Ei roskapostia"
+msgstr "_Tyhjennä roskaposti"
 
-#: ../src/mail/mail.error.xml.h:218
+#: ../src/mail/mail.error.xml.h:216
 #, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to empty Junk folder “{0}”"
@@ -21135,7 +21363,7 @@ msgstr "Lähetä ja vastaanota postia"
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1467
 msgid "Updating…"
 msgstr "Päivitetään…"
 
@@ -21143,24 +21371,24 @@ msgstr "Päivitetään…"
 msgid "Waiting…"
 msgstr "Odotetaan…"
 
-#: ../src/mail/mail-send-recv.c:1436
+#: ../src/mail/mail-send-recv.c:1433
 #, 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:1663
+#: ../src/mail/mail-send-recv.c:1660
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../src/mail/mail-send-recv.c:1665
+#: ../src/mail/mail-send-recv.c:1662
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../src/mail/mail-send-recv.c:1667
+#: ../src/mail/mail-send-recv.c:1664
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at “%s”"
@@ -21178,98 +21406,98 @@ msgstr "Muokkaa hakunäkymää"
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:312
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:313
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:314
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../src/mail/message-list.c:312
+#: ../src/mail/message-list.c:315
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../src/mail/message-list.c:313
+#: ../src/mail/message-list.c:316
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:317
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../src/mail/message-list.c:327
+#: ../src/mail/message-list.c:330
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../src/mail/message-list.c:328
+#: ../src/mail/message-list.c:331
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../src/mail/message-list.c:332
+#: ../src/mail/message-list.c:335
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../src/mail/message-list.c:333
+#: ../src/mail/message-list.c:336
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../src/mail/message-list.c:482
+#: ../src/mail/message-list.c:485
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2151 ../src/modules/itip-formatter/itip-view.c:268
+#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../src/mail/message-list.c:2160
+#: ../src/mail/message-list.c:2163
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../src/mail/message-list.c:2172
+#: ../src/mail/message-list.c:2175
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../src/mail/message-list.c:2180
+#: ../src/mail/message-list.c:2183
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../src/mail/message-list.c:2182
+#: ../src/mail/message-list.c:2185
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3267
+#: ../src/mail/message-list.c:3361
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../src/mail/message-list.c:4022 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4135 ../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:5591
+#: ../src/mail/message-list.c:5704
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/message-list.c:6654
+#: ../src/mail/message-list.c:6791
 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:6662
+#: ../src/mail/message-list.c:6799
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
-#: ../src/mail/message-list.c:6738
+#: ../src/mail/message-list.c:6875
 #, fuzzy
 #| msgid "Generating message list"
 msgid "Generating message list…"
@@ -21389,7 +21617,7 @@ msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:271
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
@@ -21432,7 +21660,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:1696
+#: ../src/modules/mail/em-mailer-prefs.c:1697
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
@@ -21539,10 +21767,8 @@ msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
-#, fuzzy
-#| msgid "_Manage Address Book groups..."
 msgid "_Manage Address Book groups…"
-msgstr "_Hallitse osoitekirjan ryhmiä..."
+msgstr "_Hallitse osoitekirjan ryhmiä…"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
 #: ../src/modules/calendar/e-task-shell-view-actions.c:733
@@ -21736,14 +21962,14 @@ msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:790
-#: ../src/modules/calendar/e-task-shell-view-actions.c:998
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:800
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 #: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
@@ -21779,29 +22005,28 @@ msgstr "_Tallenna vCard-muodossa…"
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:351
+#: ../src/modules/addressbook/e-book-shell-view.c:355
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:353
+#: ../src/modules/addressbook/e-book-shell-view.c:357
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:384
+#: ../src/modules/addressbook/e-book-shell-view.c:388
 msgid "_Send Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:386
+#: ../src/modules/addressbook/e-book-shell-view.c:390
 msgid "_Send Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:388
+#: ../src/modules/addressbook/e-book-shell-view.c:392
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
 #: ../src/modules/alarm-notify/alarm-notify.c:171
 #, c-format
-#| msgid "Failed to open calendar “{0}”"
 msgid "Failed to launch command “%s”:"
 msgstr "Ei voitu suorittaa komentoa “%s”:"
 
@@ -22061,6 +22286,8 @@ msgstr "Valitse osoitekirja"
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:302
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:323
 msgid "URL:"
 msgstr "URL:"
 
@@ -22075,6 +22302,7 @@ msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:401
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 
@@ -22331,11 +22559,10 @@ msgstr "Salli Evolutionin päivittää tiedosto"
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
-#, fuzzy
 #| msgid "Default"
 msgctxt "locale-metric"
 msgid "default:mm"
-msgstr "Oletukset"
+msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
@@ -22362,6 +22589,18 @@ msgstr "Yksiköt:"
 msgid "Location cannot be empty"
 msgstr "Sijainti ei voi olla tyhjä"
 
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:106
+#, fuzzy
+#| msgid "Show %s"
+msgid "Choose Notes"
+msgstr "Näytä %s"
+
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:337
+#, fuzzy
+#| msgid "_Find Now"
+msgid "Find Notes"
+msgstr "_Etsi nyt"
+
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
@@ -22497,11 +22736,11 @@ msgstr "Ristiriitaisuuksien haku"
 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:1113
+#: ../src/modules/calendar/e-calendar-preferences.c:1116
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1114
+#: ../src/modules/calendar/e-calendar-preferences.c:1117
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -22687,117 +22926,119 @@ msgid "Sc_roll Month View by a week"
 msgstr "Vie_ritä kuukausinäkymää viikoittain"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:57
-msgid "Order days in Week View from _left to right"
-msgstr ""
+msgid "Start Month View with the c_urrent week"
+msgstr "Käynnistä kuukausinäkymä _kuluvalla viikolla"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Order days in Week View from _left to right"
+msgstr "Järjestä päivät viikkonäkymässä _vasemmalta oikealle"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Allo_w direct edit of event Summary"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Hi_de cancelled events"
 msgstr "_Piilota perutut tapahtumat"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Alerts"
 msgstr "Hälytykset"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Display"
 msgstr "Näytä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 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:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Highlight _overdue tasks"
 msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Hid_e cancelled tasks"
 msgstr "Piilota _perutut tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
-#, fuzzy
-#| msgid "_To Do"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "To Do bar"
-msgstr "Te_htävää"
+msgstr "Tehtäväpalkki"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Show Tasks without _Due date"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 #, fuzzy
 #| msgid "Display reminders in _notification area only"
 msgid "Display Reminders window with _notifications"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 #, 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:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Display reminders for completed _tasks"
 msgstr "Poista muistutukset _valmistuneista tehtävistä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 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:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 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:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 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:82
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 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:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 #, 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:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "Default Free/Busy Server"
 msgstr "Oletus-vapaa/varattu-palvelin"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 #, 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:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 msgid ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
 msgid "Publishing Information"
 msgstr "Julkaisutiedot"
 
@@ -23130,13 +23371,13 @@ msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:814
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:821
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
@@ -23146,8 +23387,8 @@ msgstr "Yhteenveto sisältää"
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:831
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:845
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1060
 msgid "Print…"
 msgstr "Tulosta…"
 
@@ -23163,7 +23404,7 @@ msgstr "Esikatsele tulostettavaa kalenteria"
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:862
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1077
 msgid "_Save as iCalendar…"
 msgstr "_Tallenna iCalendar-muodossa…"
 
@@ -23211,29 +23452,29 @@ msgstr "_Avaa www-sivu"
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:911
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:912
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:933
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
 #, 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:937
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
 #, 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:960
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
 msgid "Cannot search with no active calendar"
 msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
@@ -23292,7 +23533,7 @@ msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
@@ -23564,30 +23805,36 @@ msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:977
+#, fuzzy
+#| msgid "Completed Tasks"
+msgid "Uncompleted Tasks"
+msgstr "Valmistuneet tehtävät"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Next 7 Days’ Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:984
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:991
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:346
+#: ../src/modules/calendar/e-task-shell-view.c:353
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../src/modules/calendar/e-task-shell-view.c:348
+#: ../src/modules/calendar/e-task-shell-view.c:355
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
@@ -23598,11 +23845,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:380
 msgid "Convert to M_eeting"
 msgstr "Muunna _kokoukseksi"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:382
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Convert the message to a meeting request"
@@ -23622,53 +23869,54 @@ msgstr "Kirjoita uusi viesti"
 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
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 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
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "Looking up POP3 server…"
 msgstr "Etsitään POP3-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "Looking up SMTP server…"
 msgstr "Etsitään SMTP-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CalDAV server"
 msgstr "CalDAV-palvelin"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 msgid "Looking up CalDAV server…"
 msgstr "Etsitään CalDAV-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CardDAV server"
 msgstr "CardDAV-palvelin"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 msgid "Looking up CardDAV server…"
 msgstr "Etsitään CardDAV-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "LDAP server"
 msgstr "LDAP-palvelin"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "Looking up LDAP server…"
 msgstr "Etsitään LDAP-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:285
 msgid "Look up in SRV records"
 msgstr "Etsitään SRV-tietueita"
 
@@ -23686,7 +23934,7 @@ msgstr "CardDAV: %s"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV- ja CardDAV-palvelin"
 
-#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "Etsi CalDAV-/CardDAV-palvelinta"
 
@@ -23700,498 +23948,507 @@ 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:264
 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:268
 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:277
 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:292
 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:296
 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:301
 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:305
 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:324
 #, 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:329
 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:333
 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:338
 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:342
 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:353
 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:359
 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:363
 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:368
 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:372
 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:380
 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:385
 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:389
 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:394
 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:398
 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:518
-#: ../src/modules/itip-formatter/itip-view.c:607
+#. Translators: The first '%s' is replaced with an abbreviated date/time of an appointment start or end, 
like "Tomorrow" or "Tomorrow 10:30";
+#. the second '%s' is replaced with the actual date, to know what the 'Tomorrow' means. What the date looks 
like depends on the user settings.
+#. Example: 'Tomorrow 10:30 (20.2.2020)'
+#: ../src/modules/itip-formatter/itip-view.c:425
+#, c-format
+msgctxt "cal-itip"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/modules/itip-formatter/itip-view.c:463
+#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:553
+#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:643
 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:468
+#: ../src/modules/itip-formatter/itip-view.c:558
+#: ../src/modules/itip-formatter/itip-view.c:647
 #, 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:470
+#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:649
 #, 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:475
 #, 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:477
 #, 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:482
 #, 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:485
 #, 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:487
 #, 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:493
 #, 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:495
 #, 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:499
 #, 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:501
 #, 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:505
 #, 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:507
 #, 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:511
 #, 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:513
 #, 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:517
 #, 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:519
 #, 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:523
 #, 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:525
 #, 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:565
 #, 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:567
 #, 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:572
 #, 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:575
 #, 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:577
 #, 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:583
 #, 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:585
 #, 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:589
 #, 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:591
 #, 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:595
 #, 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:597
 #, 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:601
 #, 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:603
 #, 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:607
 #, 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:609
 #, 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:613
 #, 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:615
 #, 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:654
 #, 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:656
 #, 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:661
 #, 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:663
 #, 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:667
 #, 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:669
 #, 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:857
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:863
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:864
-#: ../src/modules/itip-formatter/itip-view.c:1678
+#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:1701
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:872
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../src/modules/itip-formatter/itip-view.c:873
-#: ../src/modules/itip-formatter/itip-view.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:1702
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1248
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1251
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1254
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1257
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1260
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1263
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1266
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1269
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/modules/itip-formatter/itip-view.c:1272
 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:1275
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1729
-#: ../src/modules/itip-formatter/itip-view.c:1800
+#: ../src/modules/itip-formatter/itip-view.c:1704
+#: ../src/modules/itip-formatter/itip-view.c:1752
+#: ../src/modules/itip-formatter/itip-view.c:1823
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1717
+#: ../src/modules/itip-formatter/itip-view.c:1740
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1732
+#: ../src/modules/itip-formatter/itip-view.c:1755
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1735
+#: ../src/modules/itip-formatter/itip-view.c:1758
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1759
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1760
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:1738
+#: ../src/modules/itip-formatter/itip-view.c:1761
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../src/modules/itip-formatter/itip-view.c:2074
+#: ../src/modules/itip-formatter/itip-view.c:1975
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2077
+#: ../src/modules/itip-formatter/itip-view.c:1978
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3151
+#: ../src/modules/itip-formatter/itip-view.c:2974
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../src/modules/itip-formatter/itip-view.c:3715
-#: ../src/modules/itip-formatter/itip-view.c:5468
+#: ../src/modules/itip-formatter/itip-view.c:3535
+#: ../src/modules/itip-formatter/itip-view.c:5287
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:3925
+#: ../src/modules/itip-formatter/itip-view.c:3745
 #, 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:3932
+#: ../src/modules/itip-formatter/itip-view.c:3752
 #, fuzzy, c-format
 #| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgid "A task “%s” in the task list “%s” conflicts with this task"
 msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3939
+#: ../src/modules/itip-formatter/itip-view.c:3759
 #, fuzzy, c-format
 #| msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
 msgstr "Tapaaminen “%s” kalenterissa “%s” on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3950
+#: ../src/modules/itip-formatter/itip-view.c:3770
 #, 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"
@@ -24202,7 +24459,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3959
+#: ../src/modules/itip-formatter/itip-view.c:3779
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "The task list “%s” contains a task which conflicts with this task"
@@ -24212,7 +24469,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:3968
+#: ../src/modules/itip-formatter/itip-view.c:3788
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
@@ -24222,245 +24479,249 @@ msgstr[0] ""
 msgstr[1] ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen kanssa"
 
-#: ../src/modules/itip-formatter/itip-view.c:4006
+#: ../src/modules/itip-formatter/itip-view.c:3826
 #, 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:4011
+#: ../src/modules/itip-formatter/itip-view.c:3831
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Found the task in the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/itip-formatter/itip-view.c:4016
+#: ../src/modules/itip-formatter/itip-view.c:3836
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Found the memo in the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/itip-formatter/itip-view.c:4027
+#: ../src/modules/itip-formatter/itip-view.c:3847
 #, 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:4169
+#: ../src/modules/itip-formatter/itip-view.c:3989
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:4177
+#: ../src/modules/itip-formatter/itip-view.c:3997
 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:4182
+#: ../src/modules/itip-formatter/itip-view.c:4002
 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:4187
+#: ../src/modules/itip-formatter/itip-view.c:4007
 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:4481
+#: ../src/modules/itip-formatter/itip-view.c:4301
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4485
+#: ../src/modules/itip-formatter/itip-view.c:4305
 #, fuzzy
 #| msgid "Searching for an existing version of this appointment"
 msgid "Searching for an existing version of this task"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4489
+#: ../src/modules/itip-formatter/itip-view.c:4309
 #, fuzzy
 #| msgid "Searching for an existing version of this appointment"
 msgid "Searching for an existing version of this memo"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../src/modules/itip-formatter/itip-view.c:4547
+#: ../src/modules/itip-formatter/itip-view.c:4367
 msgid "Opening the calendar. Please wait…"
 msgstr "Avataan kalenteria, odota hetki…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4964
+#: ../src/modules/itip-formatter/itip-view.c:4783
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to calendar “%s”. %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4972
+#: ../src/modules/itip-formatter/itip-view.c:4791
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to task list “%s”. %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4980
+#: ../src/modules/itip-formatter/itip-view.c:4799
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to memo list “%s”. %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5000
+#: ../src/modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:5005
+#: ../src/modules/itip-formatter/itip-view.c:4824
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as accepted"
 msgid "Sent to task list “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:5010
+#: ../src/modules/itip-formatter/itip-view.c:4829
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as accepted"
 msgid "Sent to memo list “%s” as accepted"
 msgstr "Lähetetty kalenteriin “%s” hyväksyttynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:5020
+#: ../src/modules/itip-formatter/itip-view.c:4839
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:5025
+#: ../src/modules/itip-formatter/itip-view.c:4844
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as tentative"
 msgid "Sent to task list “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:5030
+#: ../src/modules/itip-formatter/itip-view.c:4849
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as tentative"
 msgid "Sent to memo list “%s” as tentative"
 msgstr "Lähetetty kalenteriin “%s”alustavana"
 
-#: ../src/modules/itip-formatter/itip-view.c:5040
+#: ../src/modules/itip-formatter/itip-view.c:4859
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:5045
+#: ../src/modules/itip-formatter/itip-view.c:4864
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as declined"
 msgid "Sent to task list “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:5050
+#: ../src/modules/itip-formatter/itip-view.c:4869
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as declined"
 msgid "Sent to memo list “%s” as declined"
 msgstr "Lähetetty kalenteriin “%s” hylättynä"
 
-#: ../src/modules/itip-formatter/itip-view.c:5060
+#: ../src/modules/itip-formatter/itip-view.c:4879
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:5065
+#: ../src/modules/itip-formatter/itip-view.c:4884
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as cancelled"
 msgid "Sent to task list “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:5070
+#: ../src/modules/itip-formatter/itip-view.c:4889
 #, fuzzy, c-format
 #| msgid "Sent to calendar “%s” as cancelled"
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:5088
+#: ../src/modules/itip-formatter/itip-view.c:4907
 #, fuzzy
 #| msgid "Saving changes to the calendar. Please wait..."
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:5091
+#: ../src/modules/itip-formatter/itip-view.c:4910
 #, fuzzy
 #| msgid "Saving changes to the calendar. Please wait..."
 msgid "Saving changes to the task list. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:5094
+#: ../src/modules/itip-formatter/itip-view.c:4913
 #, fuzzy
 #| msgid "Saving changes to the calendar. Please wait..."
 msgid "Saving changes to the memo list. Please wait…"
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:5185
+#: ../src/modules/itip-formatter/itip-view.c:5004
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5393
+#: ../src/modules/itip-formatter/itip-view.c:5212
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5410
-msgid "Sent a cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5229
+#, fuzzy
+#| msgid "Sent a cancelation notice to the delegate"
+msgid "Sent a cancellation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5414
-msgid "Could not send the cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5233
+#, fuzzy
+#| msgid "Could not send the cancelation notice to the delegate"
+msgid "Could not send the cancellation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5460
+#: ../src/modules/itip-formatter/itip-view.c:5279
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5493
+#: ../src/modules/itip-formatter/itip-view.c:5312
 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:5578
+#: ../src/modules/itip-formatter/itip-view.c:5397
 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:5653
-#: ../src/modules/itip-formatter/itip-view.c:5691
+#: ../src/modules/itip-formatter/itip-view.c:5472
+#: ../src/modules/itip-formatter/itip-view.c:5510
 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:5752
+#: ../src/modules/itip-formatter/itip-view.c:5571
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5757
+#: ../src/modules/itip-formatter/itip-view.c:5576
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5762
+#: ../src/modules/itip-formatter/itip-view.c:5581
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5773
+#: ../src/modules/itip-formatter/itip-view.c:5592
 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:5778
+#: ../src/modules/itip-formatter/itip-view.c:5597
 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:5783
+#: ../src/modules/itip-formatter/itip-view.c:5602
 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:5828
+#: ../src/modules/itip-formatter/itip-view.c:5647
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5833
+#: ../src/modules/itip-formatter/itip-view.c:5652
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:5881
-#: ../src/modules/itip-formatter/itip-view.c:5894
+#: ../src/modules/itip-formatter/itip-view.c:5700
+#: ../src/modules/itip-formatter/itip-view.c:5713
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5882
-#: ../src/modules/itip-formatter/itip-view.c:5895
+#: ../src/modules/itip-formatter/itip-view.c:5701
+#: ../src/modules/itip-formatter/itip-view.c:5714
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -24468,15 +24729,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../src/modules/itip-formatter/itip-view.c:5977
-#: ../src/modules/itip-formatter/itip-view.c:6061
-#: ../src/modules/itip-formatter/itip-view.c:6165
+#: ../src/modules/itip-formatter/itip-view.c:5796
+#: ../src/modules/itip-formatter/itip-view.c:5880
+#: ../src/modules/itip-formatter/itip-view.c:5984
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5978
-#: ../src/modules/itip-formatter/itip-view.c:6062
-#: ../src/modules/itip-formatter/itip-view.c:6166
+#: ../src/modules/itip-formatter/itip-view.c:5797
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5985
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
@@ -24484,23 +24745,23 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä tai "
 "vapaa/varattu-tietoja."
 
-#: ../src/modules/itip-formatter/itip-view.c:6071
+#: ../src/modules/itip-formatter/itip-view.c:5890
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../src/modules/itip-formatter/itip-view.c:6072
+#: ../src/modules/itip-formatter/itip-view.c:5891
 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:6659
+#: ../src/modules/itip-formatter/itip-view.c:6478
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/itip-formatter/itip-view.c:6677
+#: ../src/modules/itip-formatter/itip-view.c:6496
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -24769,66 +25030,65 @@ msgid "Create a new mail folder"
 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:782
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:786
 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:785
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:789
 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:788
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:792
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:818
+#: ../src/modules/mail/e-mail-shell-backend.c:822
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
 #. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
-#: ../src/modules/mail/e-mail-shell-backend.c:829
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 #, c-format
-#| msgid "Defaults"
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "Oletus (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:833
+#: ../src/modules/mail/e-mail-shell-backend.c:837
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:854
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:919
+#: ../src/modules/mail/e-mail-shell-backend.c:923
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:928
+#: ../src/modules/mail/e-mail-shell-backend.c:932
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:937
+#: ../src/modules/mail/e-mail-shell-backend.c:941
 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:1298
+#: ../src/modules/mail/e-mail-shell-backend.c:1302
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
@@ -24858,16 +25118,12 @@ 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:1586
-#, fuzzy
-#| msgid "_Junk"
 msgid "Empty _Junk"
-msgstr "_Roskapostia"
+msgstr "_Tyhjennä roskaposti"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1588
-#, fuzzy
-#| msgid "Permanently remove all the deleted messages from all folders"
 msgid "Delete all Junk messages from all folders"
-msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
+msgstr "Poista kaikki roskapostiviestit kaikista kansioista"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
@@ -25161,8 +25417,6 @@ msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:2023
-#, fuzzy
-#| msgid "Last 5 Days' Messages"
 msgid "Last 5 Days’ Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
@@ -25216,72 +25470,72 @@ msgstr "Valittu kansio"
 msgid "Current Folder and Subfolders"
 msgstr "Nykyinen kansio ja alakansiot"
 
-#: ../src/modules/mail/e-mail-shell-view.c:895
+#: ../src/modules/mail/e-mail-shell-view.c:1028
 #, 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:1017
+#: ../src/modules/mail/e-mail-shell-view.c:1150
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1127
+#: ../src/modules/mail/e-mail-shell-view.c:1260
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:926
+#: ../src/modules/mail/e-mail-shell-view-private.c:905
 #, 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:941
-#: ../src/modules/mail/e-mail-shell-view-private.c:958
+#: ../src/modules/mail/e-mail-shell-view-private.c:920
+#: ../src/modules/mail/e-mail-shell-view-private.c:937
 #, 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:972
-#: ../src/modules/mail/e-mail-shell-view-private.c:978
+#: ../src/modules/mail/e-mail-shell-view-private.c:951
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
 #, 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:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:964
 #, 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:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:970
 #, 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:997
+#: ../src/modules/mail/e-mail-shell-view-private.c:976
 #, 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:1014
+#: ../src/modules/mail/e-mail-shell-view-private.c:993
 #, 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:1532
+#: ../src/modules/mail/e-mail-shell-view-private.c:1511
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
@@ -25349,11 +25603,11 @@ msgid "Contains Value"
 msgstr "Sisältää arvon"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1698
+#: ../src/modules/mail/em-mailer-prefs.c:1699
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1699
+#: ../src/modules/mail/em-mailer-prefs.c:1700
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
@@ -25374,22 +25628,27 @@ msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 #: ../src/modules/mdn/evolution-mdn.c:308
 #, fuzzy, c-format
 #| msgid "Your message to %s about \"%s\" on %s has been read."
-msgid "Your message to %s about “%s” on %s has been read."
+msgid ""
+"Your message to %s about “%s” on %s has been displayed. This is no guarantee that "
+"the message has been read or understood."
 msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti ”%2$s” on luettu."
 
-#. Translators: %s is the subject of the email message.
-#: ../src/modules/mdn/evolution-mdn.c:374
-#, fuzzy, c-format
-msgid "Delivery Notification for “%s”"
-msgstr "Toimituskuittaus viestille: ”%s”"
+#. Translators: %s is the subject of the email message This text is used as
+#. a subject of a delivery notification email (basically a notification, that
+#. the user did read (or better displayed) the message).
+#: ../src/modules/mdn/evolution-mdn.c:376
+#, c-format
+#| msgid "URL: %s"
+msgid "Read: %s"
+msgstr "Luettu: %s"
 
-#: ../src/modules/mdn/evolution-mdn.c:540
+#: ../src/modules/mdn/evolution-mdn.c:542
 #, fuzzy, c-format
 msgid "Send a read receipt to “%s”"
 msgstr "Läh_etä viestin kuittaus:"
 
 #. name doesn't matter
-#: ../src/modules/mdn/evolution-mdn.c:545
+#: ../src/modules/mdn/evolution-mdn.c:547
 msgid "_Notify Sender"
 msgstr "_Ilmoita lähettäjälle"
 
@@ -25447,19 +25706,19 @@ msgstr "_Lisäosat"
 msgid "Enable and disable plugins"
 msgstr "Käytä ja poista käytöstä lisäosia"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
 msgid "Display plain text version"
 msgstr "Näytä raakatekstiversio"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Näytä raakatekstiversio multipart/alternative-viestistä"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:146
 msgid "Display HTML version"
 msgstr "Näytä HTML-versio"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 #, fuzzy
 #| msgid "Display the previous important message"
 msgid "Display HTML version of multipart/alternative message"
@@ -25630,11 +25889,11 @@ msgstr "Vaihtoehtoisesti voit sen sijaan %s (sähköposti, yhteystiedot ja kalen
 msgid "Loading accounts…"
 msgstr "Ladataan tilejä…"
 
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as…"
 msgstr "_Muotoile…"
 
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
@@ -25854,37 +26113,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:153
 msgid "Show F_ull vCard"
 msgstr "Näytä koko _vCard"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:183
 msgid "Show Com_pact vCard"
 msgstr "Näytä tiivistetty vCar_d"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:205
 msgid "Save _To Addressbook"
 msgstr "Tallenna _osoitekirjaan"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:228
 msgid "There is one other contact."
 msgstr "Löytyi yksi muu yhteystieto."
 
 #. Translators: This will always be two or more.
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:259
 msgid "Addressbook Contact"
 msgstr "Osoitekirjan yhteystieto"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:260
 msgid "Display the part as an addressbook contact"
 msgstr ""
 
@@ -25925,40 +26182,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:756 ../src/plugins/bbdb/bbdb.c:879
+#: ../src/plugins/bbdb/bbdb.c:715 ../src/plugins/bbdb/bbdb.c:838
 #: ../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:771
+#: ../src/plugins/bbdb/bbdb.c:730
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
 #. File Under setting
-#: ../src/plugins/bbdb/bbdb.c:782
+#: ../src/plugins/bbdb/bbdb.c:741
 msgid "Set File _under as “First Last”, instead of “Last, First”"
 msgstr ""
 
-#: ../src/plugins/bbdb/bbdb.c:793
+#: ../src/plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../src/plugins/bbdb/bbdb.c:813
+#: ../src/plugins/bbdb/bbdb.c:772
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:828
+#: ../src/plugins/bbdb/bbdb.c:787
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../src/plugins/bbdb/bbdb.c:838
+#: ../src/plugins/bbdb/bbdb.c:797
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:854
+#: ../src/plugins/bbdb/bbdb.c:813
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -26075,11 +26332,11 @@ msgstr "Lisää oma otsake lähteviin viesteihin."
 msgid "Email Custom Header"
 msgstr "Omat sähköpostiotsakkeet"
 
-#: ../src/plugins/external-editor/external-editor.c:111
+#: ../src/plugins/external-editor/external-editor.c:108
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
-#: ../src/plugins/external-editor/external-editor.c:112
+#: ../src/plugins/external-editor/external-editor.c:109
 msgid ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
@@ -26087,12 +26344,12 @@ msgstr ""
 "Emacsia varten käytä arvoa “xemacs”\n"
 "Vimiä varten käytä arvoa “gvim -f”"
 
-#: ../src/plugins/external-editor/external-editor.c:122
+#: ../src/plugins/external-editor/external-editor.c:119
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Käynnistä _automaattisesti, kun uutta viestiä on muokattu"
 
-#: ../src/plugins/external-editor/external-editor.c:453
-#: ../src/plugins/external-editor/external-editor.c:455
+#: ../src/plugins/external-editor/external-editor.c:489
+#: ../src/plugins/external-editor/external-editor.c:491
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -26143,10 +26400,6 @@ msgstr ""
 msgid "Select a Face Picture"
 msgstr "Valitse kasvokuva"
 
-#: ../src/plugins/face/face.c:301
-msgid "Image files"
-msgstr "Kuvatiedostot"
-
 #: ../src/plugins/face/face.c:389
 msgid "_Insert Face picture by default"
 msgstr "_Lisää kasvokuva oletuksena"
@@ -26427,10 +26680,8 @@ msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
 #: ../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"
+msgstr "Valitse _tilit, joiden kohdalla käytetään ilmoituksia:"
 
 #: ../src/plugins/mail-notification/mail-notification.c:1176
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
@@ -26565,12 +26816,12 @@ msgstr "Palvelin palautti virheellisen olion"
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:864
+#: ../src/plugins/mail-to-task/mail-to-task.c:877
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:868
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -26578,7 +26829,7 @@ msgstr ""
 "Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse jokin toinen kalenteri."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:871
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -26590,7 +26841,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. Valitse "
 "joku toinen lähde."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:874
+#: ../src/plugins/mail-to-task/mail-to-task.c:887
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
@@ -26602,35 +26853,35 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
 "Valitse joku toinen lähde."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1299
+#: ../src/plugins/mail-to-task/mail-to-task.c:1328
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1330
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1306
+#: ../src/plugins/mail-to-task/mail-to-task.c:1335
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1337
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1313
+#: ../src/plugins/mail-to-task/mail-to-task.c:1342
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1344
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1323
+#: ../src/plugins/mail-to-task/mail-to-task.c:1352
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1354
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -26806,10 +27057,6 @@ msgstr "_Tiedosto:"
 msgid "P_ort:"
 msgstr "P_ortti:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "Käyttäjät_unnus:"
-
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "Publishing Location"
 msgstr "Julkaisupaikka"
@@ -26995,18 +27242,6 @@ msgstr "_Avaa asetukset"
 msgid "Credentials are required to connect to the destination host."
 msgstr "Tilitiedot vaaditaan etäpalvelimeen yhdistämiseksi."
 
-#: ../src/shell/e-shell.c:1464 ../src/shell/e-shell-window-actions.c:891
-msgid "New _Window"
-msgstr "Uusi _Ikkuna"
-
-#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:821
-msgid "_About"
-msgstr "_Tietoja"
-
-#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:919
-msgid "_Quit"
-msgstr "_Lopeta"
-
 #: ../src/shell/e-shell-content.c:702 ../src/shell/e-shell-content.c:703
 msgid "Searches"
 msgstr "Haut"
@@ -27049,7 +27284,7 @@ msgstr "Kaikki tiedostot (*)"
 #: ../src/shell/e-shell-utils.c:343
 msgid "translator-credits"
 msgstr ""
-"Jiri Grönroos, 2012-2019\n"
+"Jiri Grönroos, 2012-2020\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
@@ -27078,292 +27313,308 @@ msgstr ""
 msgid "Website"
 msgstr "Verkkosivusto"
 
-#: ../src/shell/e-shell-view.c:295
+#: ../src/shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr "Tallennetaan käyttöliittymän tilaa"
 
-#: ../src/shell/e-shell-window-actions.c:311
+#: ../src/shell/e-shell-window-actions.c:351
 msgid "Categories Editor"
 msgstr "Luokkamuokkain"
 
-#: ../src/shell/e-shell-window-actions.c:614
+#: ../src/shell/e-shell-window-actions.c:654
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../src/shell/e-shell-window-actions.c:615
+#: ../src/shell/e-shell-window-actions.c:655
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../src/shell/e-shell-window-actions.c:811
+#: ../src/shell/e-shell-window-actions.c:851
 msgid "Collect_ion Account"
 msgstr "_Kokoelmatili"
 
-#: ../src/shell/e-shell-window-actions.c:813
+#: ../src/shell/e-shell-window-actions.c:853
 msgid "Create a new collection account"
 msgstr "Luo uusi kokoelmatili"
 
-#: ../src/shell/e-shell-window-actions.c:823
+#: ../src/shell/e-shell-window-actions.c:861
+msgid "_About"
+msgstr "_Tietoja"
+
+#: ../src/shell/e-shell-window-actions.c:863
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../src/shell/e-shell-window-actions.c:828
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ../src/shell/e-shell-window-actions.c:830
+#: ../src/shell/e-shell-window-actions.c:870
 msgid "Configure Evolution Accounts"
 msgstr "Määritä Evolution-tilit"
 
-#: ../src/shell/e-shell-window-actions.c:835
-#: ../src/shell/e-shell-window-actions.c:849
+#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:856
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/shell/e-shell-window-actions.c:858
+#: ../src/shell/e-shell-window-actions.c:898
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../src/shell/e-shell-window-actions.c:884
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "I_mport…"
 msgstr "_Tuo…"
 
-#: ../src/shell/e-shell-window-actions.c:886
+#: ../src/shell/e-shell-window-actions.c:926
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../src/shell/e-shell-window-actions.c:893
+#: ../src/shell/e-shell-window-actions.c:931
+msgid "New _Window"
+msgstr "Uusi _Ikkuna"
+
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../src/shell/e-shell-window-actions.c:905
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../src/shell/e-shell-window-actions.c:907
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../src/shell/e-shell-window-actions.c:921
+#: ../src/shell/e-shell-window-actions.c:959
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: ../src/shell/e-shell-window-actions.c:961
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/shell/e-shell-window-actions.c:966
+msgid "_Saved Searches"
+msgstr "_Tallennetut haut"
+
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "_Advanced Search…"
 msgstr "_Edistynyt haku…"
 
-#: ../src/shell/e-shell-window-actions.c:928
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../src/shell/e-shell-window-actions.c:935
+#: ../src/shell/e-shell-window-actions.c:982
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:940
+#: ../src/shell/e-shell-window-actions.c:987
 msgid "_Edit Saved Searches…"
 msgstr "_Muokkaa tallennettuja hakuja…"
 
-#: ../src/shell/e-shell-window-actions.c:942
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../src/shell/e-shell-window-actions.c:949
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../src/shell/e-shell-window-actions.c:954
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../src/shell/e-shell-window-actions.c:956
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/shell/e-shell-window-actions.c:1008
 msgid "_Save Search…"
 msgstr "Tallenna _haku…"
 
-#: ../src/shell/e-shell-window-actions.c:963
+#: ../src/shell/e-shell-window-actions.c:1010
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:975
+#: ../src/shell/e-shell-window-actions.c:1022
 msgid "_Keyboard Shortcuts"
 msgstr "_Pikanäppäimet"
 
-#: ../src/shell/e-shell-window-actions.c:977
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "Show keyboard shortcuts"
 msgstr "Näytä pikanäppäimet"
 
-#: ../src/shell/e-shell-window-actions.c:982
+#: ../src/shell/e-shell-window-actions.c:1029
 msgid "Submit _Bug Report…"
 msgstr "Lähetä _vikailmoitus…"
 
-#: ../src/shell/e-shell-window-actions.c:984
+#: ../src/shell/e-shell-window-actions.c:1031
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../src/shell/e-shell-window-actions.c:989
+#: ../src/shell/e-shell-window-actions.c:1036
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:991
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:996
+#: ../src/shell/e-shell-window-actions.c:1043
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:998
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:1026
+#: ../src/shell/e-shell-window-actions.c:1073
 msgid "Lay_out"
 msgstr "_Asettelu"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1034
+#: ../src/shell/e-shell-window-actions.c:1081
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/shell/e-shell-window-actions.c:1041
+#: ../src/shell/e-shell-window-actions.c:1088
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../src/shell/e-shell-window-actions.c:1048
+#: ../src/shell/e-shell-window-actions.c:1095
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:1109
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:1091
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1093
+#: ../src/shell/e-shell-window-actions.c:1140
 msgid "Show the menu bar"
 msgstr "Näytä valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1146
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1148
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1107
+#: ../src/shell/e-shell-window-actions.c:1154
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1109
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1117
+#: ../src/shell/e-shell-window-actions.c:1164
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1123
+#: ../src/shell/e-shell-window-actions.c:1170
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1125
+#: ../src/shell/e-shell-window-actions.c:1172
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../src/shell/e-shell-window-actions.c:1147
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1196
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../src/shell/e-shell-window-actions.c:1154
+#: ../src/shell/e-shell-window-actions.c:1201
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1156
+#: ../src/shell/e-shell-window-actions.c:1203
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1161
+#: ../src/shell/e-shell-window-actions.c:1208
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1163
+#: ../src/shell/e-shell-window-actions.c:1210
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1168
+#: ../src/shell/e-shell-window-actions.c:1215
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1170
+#: ../src/shell/e-shell-window-actions.c:1217
 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:1178
+#: ../src/shell/e-shell-window-actions.c:1225
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1185
+#: ../src/shell/e-shell-window-actions.c:1232
 msgid "Save Custom View…"
 msgstr "Tallenna oma näkymä…"
 
-#: ../src/shell/e-shell-window-actions.c:1187
+#: ../src/shell/e-shell-window-actions.c:1234
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1194
+#: ../src/shell/e-shell-window-actions.c:1248
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1204
+#: ../src/shell/e-shell-window-actions.c:1258
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1206
+#: ../src/shell/e-shell-window-actions.c:1260
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1214
+#: ../src/shell/e-shell-window-actions.c:1268
 msgid "Page Set_up…"
 msgstr "_Sivun asetukset…"
 
-#: ../src/shell/e-shell-window-actions.c:1216
+#: ../src/shell/e-shell-window-actions.c:1270
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../src/shell/e-shell-window-actions.c:1586
+#: ../src/shell/e-shell-window-actions.c:1640
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../src/shell/e-shell-window-actions.c:1709
+#: ../src/shell/e-shell-window-actions.c:1764
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1726
+#: ../src/shell/e-shell-window-actions.c:1781
 #, c-format
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1830
+#: ../src/shell/e-shell-window-actions.c:1896
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
@@ -27375,7 +27626,7 @@ msgid "New"
 msgstr "Uusi"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:787
+#: ../src/shell/e-shell-window-private.c:822
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
@@ -27487,11 +27738,11 @@ msgstr ""
 "Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa olla "
 "reagoimaton. Järjestelmävirhe: %s"
 
-#: ../src/shell/main.c:490 ../src/shell/main.c:495
+#: ../src/shell/main.c:493 ../src/shell/main.c:498
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../src/shell/main.c:551
+#: ../src/shell/main.c:554
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -27500,7 +27751,7 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../src/shell/main.c:557
+#: ../src/shell/main.c:560
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -27635,6 +27886,10 @@ msgstr "SSL-varmenne palvelulle “{0}” ei ole luotettu."
 msgid "Reason: {1}"
 msgstr "Syy: {1}"
 
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
+msgid "_View Certificate"
+msgstr "_Näytä varmenne"
+
 #: ../src/shell/shell.error.xml.h:29
 msgid "SSL certificate for address book “{0}” is not trusted."
 msgstr "Osoitekirjan “{0}” SSL-varmenne ei ole luotettu."
@@ -27783,7 +28038,7 @@ msgstr "Valitse tiedosto…"
 
 #: ../src/smime/gui/certificate-manager.c:755
 msgid "_Include certificate chain in the backup"
-msgstr ""
+msgstr "_Sisällytä varmenneketju varmuuskopioon"
 
 #. To Translators: this text was copied from Firefox
 #: ../src/smime/gui/certificate-manager.c:761
@@ -27922,10 +28177,8 @@ msgid "You have certificates on file that identify these mail servers:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
 #: ../src/smime/gui/certificate-manager.c:1626
-#, fuzzy
-#| msgid "_List name:"
 msgid "Host name"
-msgstr "_Listan nimi:"
+msgstr "Palvelimen nimi"
 
 #: ../src/smime/gui/certificate-manager.c:1628
 msgid "Issuer"
@@ -28132,6 +28385,41 @@ msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
+#~ msgid "Attendee                          "
+#~ msgstr "Osallistuja                          "
+
+#~ msgid "This certificate is not viewable"
+#~ msgstr "Tätä varmennetta ei voi näyttää"
+
+#~ msgid "Ctrl-click to open a link"
+#~ msgstr "Ctrl-napsauta avataksesi linkin"
+
+#~ msgctxt "collection-account-wizard"
+#~ msgid "%s %s."
+#~ msgstr "%s %s."
+
+#~ msgid "Image file"
+#~ msgstr "Kuvatiedosto"
+
+#~ msgid "_Plain Text"
+#~ msgstr "_Raakateksti"
+
+#~ msgid "<b>Colors</b>"
+#~ msgstr "<b>Värit</b>"
+
+#~ msgid "<b>Background Image</b>"
+#~ msgstr "<b>Taustakuva</b>"
+
+#~ msgid "_Destination"
+#~ msgstr "_Kohde"
+
+#~ msgid "Security Information"
+#~ msgstr "Turvatiedot"
+
+#, fuzzy
+#~ msgid "Delivery Notification for “%s”"
+#~ msgstr "Toimituskuittaus viestille: ”%s”"
+
 #~ msgid "%d week"
 #~ msgid_plural "%d weeks"
 #~ msgstr[0] "%d viikko"


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